[maemo-commits] [maemo-commits] r14153 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-28 10:45:59 +0300 (Fri, 28 Sep 2007)
New Revision: 14153

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
Log:

2007-09-28 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-switcher-menu-item.c: fixed the leak of the application
	and window names



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-28 07:10:00 UTC (rev 14152)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-28 07:45:59 UTC (rev 14153)
@@ -1,5 +1,10 @@
 2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-switcher-menu-item.c: fixed the leak of the application
+	and window names
+
+2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-desktop-panel-expandable.c
 	(hildon_desktop_panel_expandable_cadd): fixed the leak of a GList
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-09-28 07:10:00 UTC (rev 14152)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-09-28 07:45:59 UTC (rev 14153)
@@ -975,6 +975,7 @@
 {
   HDSwitcherMenuItemPrivate *priv;
   GdkPixbuf *pixbuf = NULL;
+  gchar *window_name = NULL, *app_name = NULL;
   
   g_return_if_fail (HD_IS_SWITCHER_MENU_ITEM (menuitem));
   g_return_if_fail (info != NULL);
@@ -1041,13 +1042,23 @@
  
     g_object_unref (pixbuf);
   }
-  
-  gtk_label_set_text (GTK_LABEL (priv->label),
-		      hd_wm_entry_info_get_app_name (priv->info));
 
-  gtk_label_set_text (GTK_LABEL (priv->label2), 
-                      hd_wm_entry_info_get_window_name (priv->info));
+  app_name = hd_wm_entry_info_get_app_name (priv->info);
+  if (app_name)
+  {
+    gtk_label_set_text (GTK_LABEL (priv->label),
+                        app_name);
+    g_free (app_name);
+  }
 
+  window_name = hd_wm_entry_info_get_window_name (priv->info);
+  if (window_name)
+  {
+    gtk_label_set_text (GTK_LABEL (priv->label2),
+                        window_name);
+    g_free (window_name);
+  }
+
   g_object_notify (G_OBJECT (menuitem), "entry-info");
 }