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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-10-18 14:41:38 +0300 (Thu, 18 Oct 2007)
New Revision: 14501

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:

2007-10-18  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-switcher-menu.c
	(hd_switcher_menu_refresh_notification_items): check if items
	are HDSwitcherMenuItem before accessing them.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-18 11:23:48 UTC (rev 14500)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-18 11:41:38 UTC (rev 14501)
@@ -1,3 +1,9 @@
+2007-10-18  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-switcher-menu.c
+	(hd_switcher_menu_refresh_notification_items): check if items
+	are HDSwitcherMenuItem before accessing them.
+
 2007-10-17  Marc-Andre Lureau  <marc-andre.lureau at nokia.com>
 
 	* libhildondesktop/libhildondesktop.h: document

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-18 11:23:48 UTC (rev 14500)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-18 11:41:38 UTC (rev 14501)
@@ -2136,22 +2136,25 @@
 
   for (l = children; l != NULL; l = g_list_next (l))
   {
-    GtkTreeIter iter;
-    gboolean ack = TRUE;
+    if (HD_IS_SWITCHER_MENU_ITEM (l->data))
+    {
+      GtkTreeIter iter;
+      gboolean ack = TRUE;
 
-    guint id = 
-      hd_switcher_menu_item_get_notification_id (HD_SWITCHER_MENU_ITEM (l->data));
+      guint id = 
+          hd_switcher_menu_item_get_notification_id (HD_SWITCHER_MENU_ITEM (l->data));
 
-    if (hildon_desktop_notification_manager_find_by_id (switcher->nm, id, &iter))
-    {
-      gtk_tree_model_get (GTK_TREE_MODEL (switcher->nm),
-                          &iter,
-                          HD_NM_COL_ACK, &ack,
-                          -1);
+      if (hildon_desktop_notification_manager_find_by_id (switcher->nm, id, &iter))
+      {
+        gtk_tree_model_get (GTK_TREE_MODEL (switcher->nm),
+                            &iter,
+                            HD_NM_COL_ACK, &ack,
+                            -1);
+      }
+
+      hd_switcher_menu_item_set_blinking (HD_SWITCHER_MENU_ITEM (l->data), 
+                                          !ack && !switcher->priv->system_inactivity);
     }
-
-    hd_switcher_menu_item_set_blinking (HD_SWITCHER_MENU_ITEM (l->data), 
-		    			!ack && !switcher->priv->system_inactivity);
   }
 
   g_list_free (children);