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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-27 13:31:39 +0300 (Thu, 27 Sep 2007)
New Revision: 14142

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 remaining changes from the previous leak fix in order to make the
	keyboard navigation work again.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-27 10:21:51 UTC (rev 14141)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-27 10:31:39 UTC (rev 14142)
@@ -1,6 +1,12 @@
 2007-09-27  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-applications-menu.c (hd_applications_menu_activate_category):
+	reverted some remaining changes from the previous leak fix in order to make the
+	keyboard navigation work again.
+
+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/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-27 10:21:51 UTC (rev 14141)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-27 10:31:39 UTC (rev 14142)
@@ -376,7 +376,6 @@
 hd_applications_menu_activate_category (GtkMenuItem *item, HDApplicationsMenu *button)
 {
   static GtkMenuItem *last_selected_item = NULL;
-  GtkWidget *sub_item_widget = NULL;
 
   GList *sub_items, *i;
   gboolean replaced = FALSE;
@@ -404,19 +403,17 @@
 
     hildon_desktop_popup_menu_replace_items (button->priv->menu_applications, 
 		    		  	     sub_items);
-
-    sub_item_widget = sub_items->data;
   }
   else
   {
     button->priv->focus_applications = TRUE;
   }
 
-  if (button->priv->focus_applications && sub_item_widget != NULL &&
-      GTK_WIDGET_IS_SENSITIVE (sub_item_widget))
+  if (button->priv->focus_applications && sub_items != NULL &&
+      GTK_WIDGET_IS_SENSITIVE (sub_items->data))
   {
     hildon_desktop_popup_menu_select_first_item (button->priv->menu_applications);
-    gtk_widget_grab_focus (sub_item_widget);
+    gtk_widget_grab_focus (GTK_WIDGET (sub_items->data));
     gtk_widget_queue_draw (GTK_WIDGET (item));
   }
   else