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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-07-27 10:35:54 +0300 (Fri, 27 Jul 2007)
New Revision: 12866

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

	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu):
	correctly set the switcher menu icon with the latest notification
	icon. Fixes NB#63134


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-27 07:25:42 UTC (rev 12865)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-27 07:35:54 UTC (rev 12866)
@@ -1,5 +1,11 @@
 2007-07-27  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu):
+	correctly set the switcher menu icon with the latest notification
+	icon. Fixes NB#63134
+
+2007-07-27  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* background-manager/Makefile.am: fixed typo and a build warning.
 
 2007-07-27  Lucas Rocha  <lucas.rocha at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-07-27 07:25:42 UTC (rev 12865)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-07-27 07:35:54 UTC (rev 12866)
@@ -775,6 +775,12 @@
     HILDON_DESKTOP_POPUP_WINDOW 
       (hildon_desktop_popup_window_new (1,GTK_ORIENTATION_HORIZONTAL,HD_POPUP_WINDOW_DIRECTION_RIGHT_BOTTOM));	     
 
+#if 0
+  g_object_set (G_OBJECT (switcher->priv->popup_window), 
+		"border-width", 4,
+		NULL);
+#endif  
+ 
   /* We don't attach the widget because if we do it, we cannot be on top of 
    * virtual keyboard. Anyway it should be transient to button
    */
@@ -785,6 +791,12 @@
   switcher->priv->notifications_window = 
     hildon_desktop_popup_window_get_pane (switcher->priv->popup_window, 0);
 
+#if 0
+  g_object_set (G_OBJECT (switcher->priv->notifications_window), 
+		"border-width", 4,
+		NULL);
+#endif
+  
   gtk_widget_set_size_request (GTK_WIDGET (switcher->priv->popup_window),
 			       340, 100);
   
@@ -803,6 +815,7 @@
 
   gtk_container_add (GTK_CONTAINER (switcher->priv->popup_window),
 		     GTK_WIDGET (switcher->priv->menu_applications));
+
   gtk_container_add (GTK_CONTAINER (switcher->priv->notifications_window),
 		     GTK_WIDGET (switcher->priv->menu_notifications));
 
@@ -1535,7 +1548,7 @@
     GHashTable *hints;
     GValue *hint;
     gchar *summary, *body;
-    gboolean ack;
+    gboolean ack, icon_is_set = FALSE;
     gint id;
 
     if (switcher->priv->clear_events_menu_item)
@@ -1613,9 +1626,12 @@
         hildon_desktop_popup_menu_add_item
          (switcher->priv->menu_notifications, GTK_MENU_ITEM (menu_item));
 
-        if (!ack)
+        if (!ack && !icon_is_set)
+        {
           hd_switcher_menu_replace_blinking_icon (switcher, icon);
-
+          icon_is_set = TRUE;
+	}
+	  
         if (!first_item)
 	  first_item = menu_item;
       }