Merge lp:~smspillaz/unity/unity.fix_1086762 into lp:unity

[Sam Spilsbury]

Use g_setenv and g_unsetenv and change the font setting back

Use g_setenv and g_unsetenv and change the font setting back.

Technically setting GSETTINGS_BACKEND=memory should fix this, but it doesn't. No idea why, so at the moment lets just not leave the font in an inconsistent state.

[Marco Trevisan (Treviño) (3v1n0)]

Fine, thanks.

review: Approve

=== modified file 'tests/test_panel_style.cpp'
--- tests/test_panel_style.cpp	2012-08-01 17:33:50 +0000
+++ tests/test_panel_style.cpp	2012-12-05 12:11:23 +0000
@@ -43,7 +43,7 @@
 
   /* override */ void SetUp()
   {
-    g_setenv("GSETTINGS_BACKEND", "memory", TRUE);
+    g_setenv ("GSETTINGS_BACKEND", "memory", 1);
 
     gsettings = g_settings_new("org.gnome.desktop.wm.preferences");
     g_settings_set_string(gsettings, "titlebar-font", TITLEBAR_FONT.c_str());
@@ -53,7 +53,7 @@
 
   /* override */ void TearDown()
   {
-    g_setenv("GSETTINGS_BACKEND", "", TRUE);
+    g_unsetenv ("GSETTINGS_BACKEND");
   }
 };
 
@@ -70,12 +70,16 @@
     signal_received = true;
   });
 
+  gchar *old_font = g_settings_get_string(gsettings, "titlebar-font");
   g_settings_set_string(gsettings, "titlebar-font", "Ubuntu Italic 11");
 
   sleep(1);
 
   ASSERT_TRUE(signal_received);
   ASSERT_EQ(panel_style_instance->GetFontDescription(panel::PanelItem::TITLE), "Ubuntu Italic 11");  
+
+  g_settings_set_string(gsettings, "titlebar-font", old_font);
+  g_free (old_font);
 }
 
 }