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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-28 11:58:24 +0300 (Tue, 28 Aug 2007)
New Revision: 13427

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

	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu,
	hd_switcher_menu_notification_deleted_cb): reset main icon when a
	blinking notification is deleted. Fixes NB#65335.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-28 08:35:54 UTC (rev 13426)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-28 08:58:24 UTC (rev 13427)
@@ -1,8 +1,14 @@
 2007-08-28  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu,
+	hd_switcher_menu_notification_deleted_cb): reset main icon when a
+	blinking notification is deleted. Fixes NB#65335.
+
+2007-08-28  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-switcher-menu.c (hd_switcher_menu_update_open): ensure the
 	active window menu item is selected when opening switcher menu.
-	Fixes bug #65439.
+	Fixes bug NB#65439.
 
 2007-08-24  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-08-28 08:35:54 UTC (rev 13426)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-28 08:58:24 UTC (rev 13427)
@@ -162,6 +162,8 @@
 
   GtkTreeIter		   *last_iter_added;
 
+  guint                     blinking_notification;
+  
   HDWMEntryInfo		   *last_urgent_info;
 
   GtkWidget		   *window_dialog;
@@ -1691,6 +1693,7 @@
 
         if (!ack && !icon_is_set)
         {
+	  switcher->priv->blinking_notification = id;
           hd_switcher_menu_replace_blinking_icon (switcher, icon);
           icon_is_set = TRUE;
 	}
@@ -2261,6 +2264,9 @@
 
       if (menu_item)
       {
+        if (switcher->priv->blinking_notification == id)
+	  hd_switcher_menu_reset_main_icon (switcher);
+	
         hildon_desktop_popup_menu_remove_item (switcher->priv->menu_notifications,
 	                                       menu_item);