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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-09-24 19:27:30 +0300 (Mon, 24 Sep 2007)
New Revision: 14050

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-09-24  Moises Martinez  <moises.martinez at nokia.com>

        * src/hd-switcher-menu.c: (hd_switcher_menu_changed_info_cb),
        (hd_switcher_menu_fullscreen_cb):
        - Notifications on fullscreen when urgency hint set.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 14:50:35 UTC (rev 14049)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 16:27:30 UTC (rev 14050)
@@ -1,3 +1,9 @@
+2007-09-24  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hd-switcher-menu.c: (hd_switcher_menu_changed_info_cb),
+	(hd_switcher_menu_fullscreen_cb):
+	- Notifications on fullscreen when urgency hint set.
+
 2007-09-24  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu-item.c: disabled all debug messages by default.

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-24 14:50:35 UTC (rev 14049)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-24 16:27:30 UTC (rev 14050)
@@ -2137,6 +2137,9 @@
     if (pos > SWITCHER_N_SLOTS)
       make_it_blink = TRUE;	     
   }	  
+
+  if (switcher->priv->fullscreen)
+    make_it_blink = TRUE;	  
 	  
   children =
     hildon_desktop_popup_menu_get_children (switcher->priv->menu_applications);
@@ -2203,6 +2206,14 @@
   {
     hd_switcher_menu_item_set_blinking (HD_SWITCHER_MENU_ITEM (menu_item), FALSE);
   }
+
+  if (make_it_blink && switcher->priv->fullscreen && GTK_BIN (switcher->priv->toggle_button)->child != switcher->priv->icon)
+  {
+    if (switcher->priv->fullscreen)
+      hd_switcher_menu_dettach_button (switcher);
+    else
+      hd_switcher_menu_attach_button (switcher);
+  }
 }
 
 static void 
@@ -2310,7 +2321,27 @@
   }
   
   if (!fullscreen)
-    hd_switcher_menu_attach_button (switcher);	   
+  {	  
+    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);
+  }
 }	
 
 static void