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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-06-25 11:01:27 +0300 (Mon, 25 Jun 2007)
New Revision: 12438

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

	* src/hd-switcher-menu.c: correctly add separators when populating the
	notifications menu on startup.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-25 07:50:08 UTC (rev 12437)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-25 08:01:27 UTC (rev 12438)
@@ -1,5 +1,10 @@
 2007-06-25  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c: correctly add separators when populating the
+	notifications menu on startup.
+
+2007-06-25  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* debian/control: added build dependency on libsqlite3-dev to enable
 	notification manager persistency support.
 	* libhildondesktop/hildon-desktop-notification-manager.c: dynamicaly

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-06-25 07:50:08 UTC (rev 12437)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-06-25 08:01:27 UTC (rev 12438)
@@ -1576,7 +1576,8 @@
 {
   GtkTreeIter  iter;	
   GtkTreeModel *nm = GTK_TREE_MODEL (switcher->nm);
-
+  gboolean first_item = TRUE;
+  
   if (gtk_tree_model_get_iter_first (nm, &iter))
   {
     gint id;
@@ -1587,6 +1588,13 @@
     {
       GtkWidget *menu_item;
 
+      if (!first_item)
+        hildon_desktop_popup_menu_add_item
+          (switcher->priv->menu_notifications,
+          GTK_MENU_ITEM (gtk_separator_menu_item_new ()));
+      else
+        first_item = FALSE;
+
       gtk_tree_model_get (nm,
                           &iter,
                           HD_NM_COL_ID, &id,
@@ -1608,10 +1616,6 @@
        (switcher->priv->menu_notifications, GTK_MENU_ITEM (menu_item));
 
       hd_switcher_menu_replace_blinking_icon (switcher, icon);
-
-      hildon_desktop_popup_menu_add_item
-       (switcher->priv->menu_notifications,
-        GTK_MENU_ITEM (gtk_separator_menu_item_new ()));
     }
     while (gtk_tree_model_iter_next (nm, &iter));
   }