Merge lp:~charlesk/indicator-session/lp-957342 into lp:indicator-session/0.4

[Charles Kerr]

[lp:~charlesk/indicator-session/lp-957342]

250. By Charles Kerr on 2012-03-16

plug two more memory leaks. g_variant_get("s") makes a newly-allocated duplicated string, g_variant_get("&s") returns the internal const string.

251. By Charles Kerr on 2012-03-17

fix memory leak updating the username label -- gtk_label_set_text() takes a const char*, we don't need to g_strdup() the string before passing it in

[Conor Curran (cjcurran)]

Well spotted !

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/device-menu-mgr.c'
--- src/device-menu-mgr.c	2012-02-23 14:40:17 +0000
+++ src/device-menu-mgr.c	2012-03-17 00:26:18 +0000
@@ -166,11 +166,12 @@
 	}
 
 	if (g_strcmp0 (key, KEY_LOCK_SCREEN) == 0) {
-		g_debug("Keybinding changed to: %s", g_settings_get_string(settings, key));
+		gchar * val = g_settings_get_string(settings, key);
+		g_debug("Keybinding changed to: %s", val);
 		if (lock_menuitem != NULL) {
-			dbusmenu_menuitem_property_set_shortcut_string (lock_menuitem,
-                                                      g_settings_get_string(settings, key));
+			dbusmenu_menuitem_property_set_shortcut_string (lock_menuitem, val);
 		}
+		g_free (val);
 	}
 	return;
 }

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2012-02-23 05:22:14 +0000
+++ src/indicator-session.c	2012-03-17 00:26:18 +0000
@@ -428,7 +428,7 @@
 	}
   
   const gchar* username = NULL;
-  g_variant_get (result, "(s)", &username);
+  g_variant_get (result, "(&s)", &username);
   indicator_session_update_users_label (self, username);
 	return;
 }
@@ -481,7 +481,7 @@
 
 	if (g_strcmp0(signal_name, "UserRealNameUpdated") == 0) {
     const gchar* username = NULL;
-    g_variant_get (parameters, "(s)", &username);
+    g_variant_get (parameters, "(&s)", &username);
     indicator_session_update_users_label (self, username);	
   }
   else if (g_strcmp0(signal_name, "UserMenuIsVisible") == 0) {
@@ -713,14 +713,8 @@
   }  
 
   GSettings* settings = g_settings_new ("com.canonical.indicator.session");
-  gboolean use_name = g_settings_get_boolean (settings,
-                                              "show-real-name-on-panel");    
+  const gboolean use_name = g_settings_get_boolean (settings, "show-real-name-on-panel");    
+  gtk_label_set_text (self->users.label, name);
+  gtk_widget_set_visible (GTK_WIDGET(self->users.label), use_name);
   g_object_unref (settings);
-  gtk_label_set_text (self->users.label, g_strdup(name));
-  if (use_name){ 
-    gtk_widget_show(GTK_WIDGET(self->users.label));
-  }
-  else{
-    gtk_widget_hide(GTK_WIDGET(self->users.label));
-  }
 }