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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-04 15:15:54 +0300 (Tue, 04 Sep 2007)
New Revision: 13574

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

	* src/hd-applications-menu.c (hd_applications_menu_button_toggled):
	fix critical warning when popping down the window with no application
	menu item is selected.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-04 12:11:48 UTC (rev 13573)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-04 12:15:54 UTC (rev 13574)
@@ -1,3 +1,9 @@
+2007-09-04  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-applications-menu.c (hd_applications_menu_button_toggled):
+	fix critical warning when popping down the window with no application
+	menu item is selected.
+
 2007-09-04  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-panel-expandable.c:

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-04 12:11:48 UTC (rev 13573)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-04 12:15:54 UTC (rev 13574)
@@ -1140,8 +1140,9 @@
     selected_item = 
       hildon_desktop_popup_menu_get_selected_item (button->priv->menu_applications);
 
-    hildon_desktop_popup_menu_deselect_item (button->priv->menu_applications,
-		    			     selected_item);
+    if (GTK_IS_MENU_ITEM (selected_item))
+      hildon_desktop_popup_menu_deselect_item (button->priv->menu_applications,
+  		    			       selected_item);
 
     hildon_desktop_popup_window_popdown (button->priv->popup_window);