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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-10-29 15:40:28 +0200 (Mon, 29 Oct 2007)
New Revision: 14669

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): revert last
	commit as it brings one regression when blinking icon on switcher area.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 12:51:46 UTC (rev 14668)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 13:40:28 UTC (rev 14669)
@@ -1,5 +1,10 @@
 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.
+
+2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-switcher-menu.c (hd_switcher_menu_fullscreen_cb): do not
 	reset switcher button icon when fullscreen signal is false in order to
 	avoid stopping the blinking when launching an application or coming

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-29 12:51:46 UTC (rev 14668)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-10-29 13:40:28 UTC (rev 14669)
@@ -2429,6 +2429,24 @@
   if (!fullscreen)
   {	  
     hd_switcher_menu_attach_button (switcher);
+
+    guint pos = 0;
+    GList *l, *apps = hd_wm_get_applications (switcher->hdwm);
+
+    for (l = apps; l != NULL; l = g_list_next (l), pos++)
+    {
+       HDWMEntryInfo *iter_info = (HDWMEntryInfo *) l->data;
+
+       if (HD_WM_IS_APPLICATION (iter_info) && switcher->priv->last_urgent_info)
+       {
+         if (iter_info == hd_wm_entry_info_get_parent (switcher->priv->last_urgent_info) ||
+	     iter_info == switcher->priv->last_urgent_info)
+           break;
+       }
+    }
+
+    if (pos <= SWITCHER_N_SLOTS)
+      hd_switcher_menu_reset_main_icon (switcher, TRUE);
   }
 }