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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-10-29 16:00:32 +0200 (Mon, 29 Oct 2007)
New Revision: 14670

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

	* src/hd-switcher-menu.c (hd_switcher_menu_fullscreen_cb): only reset
	switcher button icon if the application is only shown in switcher menu
	and there's no blinking notification icon. Fixes: NB#72861, NB#72860.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 13:40:28 UTC (rev 14669)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 14:00:32 UTC (rev 14670)
@@ -1,5 +1,11 @@
 2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c (hd_switcher_menu_fullscreen_cb): only reset
+	switcher button icon if the application is only shown in switcher menu
+	and there's no blinking notification icon. Fixes: NB#72861, NB#72860.
+
+2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-switcher-menu.c (hd_switcher_menu_fullscreen_cb): revert last
 	commit as it brings one regression when blinking icon on switcher area.
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-29 13:40:28 UTC (rev 14669)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-29 14:00:32 UTC (rev 14670)
@@ -2427,7 +2427,7 @@
   }
   
   if (!fullscreen)
-  {	  
+  {
     hd_switcher_menu_attach_button (switcher);
 
     guint pos = 0;
@@ -2445,7 +2445,7 @@
        }
     }
 
-    if (pos <= SWITCHER_N_SLOTS)
+    if (pos <= SWITCHER_N_SLOTS && switcher->priv->blinking_notification == -1)
       hd_switcher_menu_reset_main_icon (switcher, TRUE);
   }
 }