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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-27 13:21:51 +0300 (Thu, 27 Sep 2007)
New Revision: 14141

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:
2007-09-27  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-applications-menu.c (hd_applications_menu_activate_category):
	reverted some changes from the previous leak fix in order to make the
	focus move between panes work again.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-27 09:41:11 UTC (rev 14140)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-27 10:21:51 UTC (rev 14141)
@@ -1,3 +1,9 @@
+2007-09-27  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-applications-menu.c (hd_applications_menu_activate_category):
+	reverted some changes from the previous leak fix in order to make the
+	focus move between panes work again.
+
 2007-09-27 Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-desktop.c (hd_desktop_plugin_list_from_conf): duplicate

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-27 09:41:11 UTC (rev 14140)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-27 10:21:51 UTC (rev 14141)
@@ -378,15 +378,18 @@
   static GtkMenuItem *last_selected_item = NULL;
   GtkWidget *sub_item_widget = NULL;
 
+  GList *sub_items, *i;
+  gboolean replaced = FALSE;
+  
+  sub_items = hildon_desktop_popup_menu_get_children 
+	  (button->priv->menu_applications);
+  
   if (last_selected_item != item)
   {
-    GList *sub_items, *i;
     last_selected_item = item;
 
-    sub_items = hildon_desktop_popup_menu_get_children
-        (button->priv->menu_applications);
-
-
+    replaced = TRUE;
+    
     for (i = g_list_first (sub_items); i; i = i->next)
     {
       GtkMenuItem *child = (GtkMenuItem *) i->data;
@@ -422,6 +425,9 @@
   }
 
   button->priv->focus_applications = FALSE;
+
+  if (!replaced)
+    g_list_free (sub_items);
 }
 
 static void