[maemo-commits] [maemo-commits] r14039 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-24 16:32:13 +0300 (Mon, 24 Sep 2007)
New Revision: 14039

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
Log:

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

	* libhildondesktop/hildon-desktop-popup-menu.c: fixed leaks
	of the children list in several places



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 13:21:44 UTC (rev 14038)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 13:32:13 UTC (rev 14039)
@@ -1,5 +1,10 @@
 2007-09-24 Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/hildon-desktop-popup-menu.c: fixed leaks
+	of the children list in several places
+
+2007-09-24 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/libhildonmenu.c: do not duplicate the name
 	of the applications before adding to the treemodel, because the model
 	does this for us. Fixes: NB#70641

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-09-24 13:21:44 UTC (rev 14038)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-09-24 13:32:13 UTC (rev 14039)
@@ -1044,6 +1044,7 @@
     
     hildon_desktop_popup_menu_real_remove_item (menu, GTK_MENU_ITEM (item));
   }
+  g_list_free (children);
  
   for (l = items; l != NULL; l = l->next)
   {
@@ -1136,8 +1137,11 @@
       break;
     }	    
   }
-}	
 
+  if (children)
+    g_list_free (children);
+}
+
 void
 hildon_desktop_popup_menu_select_last_item (HildonDesktopPopupMenu *menu)
 {
@@ -1161,8 +1165,11 @@
       break;
     }
   }
-}	
 
+  if (children)
+    g_list_free (children);
+}
+
 void
 hildon_desktop_popup_menu_activate_item (HildonDesktopPopupMenu *menu, GtkMenuItem *item)
 {	
@@ -1181,7 +1188,8 @@
     }
   }
 
-  g_list_free (children);				  
+  if (children)
+    g_list_free (children);				  
 }	
 
 GtkMenuItem *