Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream into lp:~ubuntu-desktop/indicator-session/ubuntu

[Charles Kerr]

0.3.95

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-14 18:34:16 +0000
+++ ChangeLog	2012-03-21 17:33:21 +0000
@@ -1,5 +1,29 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Charles Kerr  <[e-mail]>
+
+	0.3.95
+
[phone]  Charles Kerr  <[e-mail]>
+
+	Merge lp:~charlesk/indicator-session/lp-957342 to fix a pair of indicator-session memory leaks.
+
[phone]  Charles Kerr  <[e-mail]>
+
+	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
+
[phone]  Charles Kerr  <[e-mail]>
+
+	plug two more memory leaks. g_variant_get("s") makes a newly-allocated duplicated string, g_variant_get("&s") returns the internal const string.
+
[phone]  Charles Kerr  <[e-mail]>
+
+	plug two leaked strings in keybinding_changed()
+
[phone]  Charles Kerr  <[e-mail]>
+
+	to pull a const string from g_variant_get(), use a format string "&s", not "s"
+
 2012-03-14  Charles Kerr  <[e-mail]>
 
 	0.3.94

=== modified file 'configure'
--- configure	2012-03-14 18:34:16 +0000
+++ configure	2012-03-21 17:33:21 +0000
@@ -2774,7 +2774,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.3.94
+ VERSION=0.3.95
 
 
 cat >>confdefs.h <<_ACEOF

=== modified file 'configure.ac'
--- configure.ac	2012-03-14 18:38:20 +0000
+++ configure.ac	2012-03-21 17:33:21 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.94)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.95)
 
 AM_MAINTAINER_MODE
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-14 18:38:30 +0000
+++ debian/changelog	2012-03-21 17:33:21 +0000
@@ -1,3 +1,10 @@
+indicator-session (0.3.95-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Fix small memory leaks (lp: #957342)
+
+ -- Charles Kerr <[e-mail]>  Wed, 21 Mar 2012 12:28:43 -0500
+
 indicator-session (0.3.94-0ubuntu1) precise; urgency=low
 
   * New upstream release.

=== removed directory 'debian/patches'
=== 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-21 17:33:21 +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 15:17:10 +0000
+++ src/indicator-session.c	2012-03-21 17:33:21 +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));
-  }
 }