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

[From: subversion at stage.maemo.org]

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

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

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/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-26 14:49:17 UTC (rev 14128)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-26 16:14:06 UTC (rev 14129)
@@ -1,3 +1,8 @@
+2007-09-26 Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-desktop-popup-menu.c: fixed a warning
+	when deselecting a NULL item
+
 2007-09-26  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu.c (hd_switcher_menu_changed_info_cb): make sure

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-26 14:49:17 UTC (rev 14128)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-09-26 16:14:06 UTC (rev 14129)
@@ -557,7 +557,8 @@
       if (hildon_desktop_popup_menu_item_is_selectable (GTK_WIDGET (l->data)) &&
           menu->priv->selected_item != GTK_MENU_ITEM (l->data))
       {
-        gtk_item_deselect (GTK_ITEM (menu->priv->selected_item));
+        if (GTK_IS_ITEM (menu->priv->selected_item))
+          gtk_item_deselect (GTK_ITEM (menu->priv->selected_item));
         gtk_item_select (GTK_ITEM (l->data));
         menu->priv->selected_item = GTK_MENU_ITEM (l->data);
       }
@@ -716,7 +717,8 @@
         if (hildon_desktop_popup_menu_item_is_selectable (GTK_WIDGET (l->data)) &&
             menu->priv->selected_item != GTK_MENU_ITEM (l->data))
         {
-          gtk_item_deselect (GTK_ITEM (menu->priv->selected_item));
+          if (GTK_IS_ITEM (menu->priv->selected_item))
+            gtk_item_deselect (GTK_ITEM (menu->priv->selected_item));
           gtk_item_select (GTK_ITEM (l->data));
           menu->priv->selected_item = GTK_MENU_ITEM (l->data);
         }