Merge lp:~smspillaz/unity/unity.6.0.fix_1036521 into lp:unity

[Sam Spilsbury]

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

Test Suite: https://code.launchpad.net/~smspillaz/nux/nux.3.0.fix_1036521/+merge/125106

Unmerged revisions

2692. By Sam Spilsbury on 2012-09-19

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

2691. By Andrea Azzarone on 2012-09-18

Use uuid+label as volume ID.. Fixes: . Approved by Marco Trevisan (Treviño).

2690. By Thomi Richards on 2012-09-18

Fix several autopilot tests.. Fixes: . Approved by Omer Akram.

2689. By Thomi Richards on 2012-09-17

Fix several autopilot tests.. Fixes: . Approved by Christopher Lee.

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2012-05-07 22:28:17 +0000
+++ launcher/CairoBaseWindow.cpp	2012-09-19 06:38:27 +0000
@@ -19,6 +19,7 @@
 
 
 #include <Nux/Nux.h>
+#include <Nux/WindowCompositor.h>
 
 #include "unity-shared/CairoTexture.h"
 #include "CairoBaseWindow.h"
@@ -58,7 +59,7 @@
   if (_use_blurred_background && _compute_blur_bkg)
   {
     auto current_fbo = nux::GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
-    nux::GetGraphicsDisplay()->GetGpuDevice()->DeactivateFrameBuffer();
+    nux::GetWindowCompositor ().RestoreMainFramebuffer();
 
     gfxContext.SetViewport(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());
     gfxContext.SetScissor(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());
 
=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2012-08-28 17:39:44 +0000
+++ launcher/VolumeImp.cpp	2012-09-19 06:38:27 +0000
@@ -89,7 +89,10 @@
 
   std::string GetIdentifier() const
   {
-    return glib::String(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UUID)).Str();
+    glib::String label(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_LABEL));
+    glib::String uuid(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UUID));
+
+    return uuid.Str() + "-" + label.Str();
   }
 
   bool HasSiblings() const
 
=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
=== modified file 'tests/gmockvolume.c'
--- tests/gmockvolume.c	2012-09-12 10:58:57 +0000
+++ tests/gmockvolume.c	2012-09-19 06:38:27 +0000
@@ -61,6 +61,12 @@
     self->uuid = NULL;
   }
 
+  if (self->label)
+  {
+    g_free(self->label);
+    self->label = NULL;
+  }
+
   if (self->mount)
   {
     g_object_unref(self->mount);
@@ -86,7 +92,12 @@
   guint32 uuid = g_random_int();
   mock_volume->name = g_strdup_printf("MockVolume %u", uuid);
   mock_volume->icon = g_icon_new_for_string("", NULL);
+<<<<<<< TREE
   mock_volume->uuid = g_strdup_printf("%u", uuid);
+=======
+  mock_volume->uuid = g_strdup("");
+  mock_volume->label = g_strdup("");
+>>>>>>> MERGE-SOURCE
   mock_volume->mount = NULL;
 }
 
@@ -153,6 +164,15 @@
   return g_strdup (self->uuid);
 }
 
+void
+g_mock_volume_set_label (GMockVolume *volume, const char* label)
+{
+  if (volume->label)
+    g_free(volume->label);
+
+  volume->label = g_strdup (label);
+}
+
 static GDrive *
 g_mock_volume_get_drive (GVolume *volume)
 {
@@ -254,6 +274,8 @@
 
   if (!g_strcmp0 (kind, G_VOLUME_IDENTIFIER_KIND_UUID))
     return g_strdup (self->uuid);
+  else if (!g_strcmp0 (kind, G_VOLUME_IDENTIFIER_KIND_LABEL))
+    return g_strdup (self->label);
 
   return NULL;
 }
 
=== modified file 'tests/gmockvolume.h'
--- tests/gmockvolume.h	2012-08-17 15:53:06 +0000
+++ tests/gmockvolume.h	2012-09-19 06:38:27 +0000
@@ -43,6 +43,7 @@
   char *name;
   GIcon *icon;
   char *uuid;
+  char *label;
   GMount *mount;
 };
 
@@ -56,6 +57,7 @@
 void          g_mock_volume_set_can_eject (GMockVolume* volume, gboolean can_eject);
 void          g_mock_volume_set_name  (GMockVolume *volume, const char *name);
 void          g_mock_volume_set_icon  (GMockVolume *volume, GIcon *icon);
+void          g_mock_volume_set_label  (GMockVolume *volume, const char *label);
 void          g_mock_volume_set_uuid  (GMockVolume *volume, const char *uuid);
 void          g_mock_volume_set_mount (GMockVolume *volume, GMount *mount);
 
 
=== modified file 'tests/test_volume_imp.cpp'
--- tests/test_volume_imp.cpp	2012-08-28 17:28:02 +0000
+++ tests/test_volume_imp.cpp	2012-09-19 06:38:27 +0000
@@ -98,10 +98,13 @@
 
 TEST_F(TestVolumeImp, TestGetIdentifier)
 {
-  std::string const uuid("0123456789abc");
+  std::string const uuid = "uuid";
+  std::string const label = "label";
 
   g_mock_volume_set_uuid(gvolume_, uuid.c_str());
-  EXPECT_EQ(volume_->GetIdentifier(), uuid);
+  g_mock_volume_set_label(gvolume_, label.c_str());
+
+  EXPECT_EQ(volume_->GetIdentifier(), uuid + "-" + label);
 }
 
 TEST_F(TestVolumeImp, TestIsMounted)