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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-26 19:34:14 +0300 (Wed, 26 Sep 2007)
New Revision: 14130

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

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

	* src/hd-switcher-menu.c: fixed numerous leaks of GList.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-26 16:14:06 UTC (rev 14129)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-26 16:34:14 UTC (rev 14130)
@@ -1,5 +1,9 @@
 2007-09-26 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-switcher-menu.c: fixed numerous leaks of GList.
+
+2007-09-26 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c: fixed a warning
 	when deselecting a NULL item
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-26 16:14:06 UTC (rev 14129)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-26 16:34:14 UTC (rev 14130)
@@ -493,6 +493,8 @@
       (switcher->priv->menu_applications,
        GTK_MENU_ITEM (last->data));
 
+    g_list_free (applications);
+
     return TRUE;
   } 
 
@@ -609,6 +611,8 @@
       }
     }
   }
+
+  g_list_free (children);
 #endif
 
   hd_switcher_menu_changed_stack_cb (switcher->hdwm, 
@@ -1622,6 +1626,8 @@
 static void 
 hd_switcher_menu_toggled_cb (GtkWidget *button, HDSwitcherMenu *switcher)
 {
+  GList *children;
+  
   if (!GTK_WIDGET_VISIBLE (GTK_BIN (switcher->priv->toggle_button)->child))
     return;
 
@@ -1641,10 +1647,15 @@
     (gpointer)switcher,
     GDK_CURRENT_TIME);
 
-  if (!hildon_desktop_popup_menu_get_children (switcher->priv->menu_notifications))
+  children = hildon_desktop_popup_menu_get_children (switcher->priv->menu_notifications);
+  
+  if (!children)
     gtk_widget_hide (switcher->priv->notifications_window);
   else
+  {
     gtk_widget_show (switcher->priv->notifications_window);  
+    g_list_free (children);
+  }
 
   switcher->priv->is_open = TRUE;
 
@@ -2049,6 +2060,8 @@
       }
     }
   } 
+
+  g_list_free (children);
 }
 
 static void
@@ -2077,6 +2090,8 @@
     hd_switcher_menu_item_set_blinking (HD_SWITCHER_MENU_ITEM (l->data), 
 		    			!ack && !switcher->priv->system_inactivity);
   }
+
+  g_list_free (children);
 }
 
 static void 
@@ -2254,6 +2269,8 @@
       }
     }	    
   }	  
+
+  g_list_free (children);
 }
 
 static void