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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-10-25 13:51:28 +0300 (Thu, 25 Oct 2007)
New Revision: 14612

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

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

	* src/hd-switcher-menu.c: fixed a compiler warning. Fix courtersy
	of Xan L?\195?\179pez.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-25 10:47:34 UTC (rev 14611)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-25 10:51:28 UTC (rev 14612)
@@ -1,3 +1,8 @@
+2007-10-25  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-switcher-menu.c: fixed a compiler warning. Fix courtersy
+	of Xan López.
+
 2007-10-24  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 2.0.2

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-25 10:47:34 UTC (rev 14611)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-25 10:51:28 UTC (rev 14612)
@@ -204,8 +204,6 @@
 
 static void hd_switcher_menu_create_applications_menu (HDSwitcherMenu *switcher, HDWM *hdwm);
 static void hd_switcher_menu_refresh_application_items (HDSwitcherMenu *switcher);
-static void hd_switcher_menu_refresh_notification_items (HDSwitcherMenu *switcher);
-
 static void hd_switcher_menu_replace_blinking_icon (HDSwitcherMenu *switcher, GdkPixbuf *icon);
 
 static void hd_switcher_menu_add_info_cb (HDWM *hdwm, HDWMEntryInfo *info, HDSwitcherMenu *switcher);
@@ -869,6 +867,39 @@
 }
 
 #ifdef HAVE_LIBOSSO
+static void
+hd_switcher_menu_refresh_notification_items (HDSwitcherMenu *switcher)
+{
+  GList *children = NULL, *l;
+  
+  children = hildon_desktop_popup_menu_get_children (switcher->priv->menu_notifications);
+
+  for (l = children; l != NULL; l = g_list_next (l))
+  {
+    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));
+
+      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);
+    }
+  }
+
+  g_list_free (children);
+}
+
 static void 
 hd_switcher_menu_display_state_cb (osso_display_state_t state, gpointer data)
 {
@@ -2127,39 +2158,6 @@
   g_list_free (children);
 }
 
-static void
-hd_switcher_menu_refresh_notification_items (HDSwitcherMenu *switcher)
-{
-  GList *children = NULL, *l;
-  
-  children = hildon_desktop_popup_menu_get_children (switcher->priv->menu_notifications);
-
-  for (l = children; l != NULL; l = g_list_next (l))
-  {
-    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));
-
-      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);
-    }
-  }
-
-  g_list_free (children);
-}
-
 static void 
 hd_switcher_menu_changed_info_cb (HDWM *hdwm,
 				  HDWMEntryInfo *info,