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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-23 17:24:09 +0300 (Wed, 23 May 2007)
New Revision: 11781

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

	* src/hd-switcher-menu.c: check state of blinking application when
        application is in app switcher slot. Fixes: NB#57680
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 14:16:46 UTC (rev 11780)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 14:24:09 UTC (rev 11781)
@@ -1,5 +1,10 @@
 2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
 
+	* src/hd-switcher-menu.c: check state of blinking application when
+	application is in app switcher slot. Fixes: NB#57680
+
+2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hn-app-switcher.c:
 	- Show items in junk dialog of application killer. Fixes: NB54712
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-05-23 14:16:46 UTC (rev 11780)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-05-23 14:24:09 UTC (rev 11781)
@@ -87,6 +87,8 @@
 
 #define SWITCHER_DETTACHED_TIMEOUT 5000
 
+#define SWITCHER_N_SLOTS 3	
+
 enum 
 {
   PROP_MENU_NITEMS=1,
@@ -775,33 +777,42 @@
 hd_switcher_menu_check_content (HDSwitcherMenu *switcher)
 {
   GList *children = NULL;
+  GList *apps = NULL;
+  guint n_apps = 0;
 
   children = 
     hildon_desktop_popup_menu_get_children (switcher->priv->menu_notifications);
+
+  apps = hd_wm_get_applications (switcher->hdwm);
   
-  if ((hd_wm_get_applications (switcher->hdwm) != NULL) || children)
+  if (apps || children)
   {
-     gtk_widget_show (GTK_BIN (switcher->priv->toggle_button)->child);
+    gtk_widget_show (GTK_BIN (switcher->priv->toggle_button)->child);
      
-     if (children)
-     {	     
-       if (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);	     
-       }	       
+    if (children)
+    {	     
+      if (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);	     
+      }	       
 	     
-       hd_switcher_menu_update_highlighting (switcher, TRUE);
-     }
-     else
-     {	     
-       hd_switcher_menu_update_highlighting (switcher, FALSE);        
-     }
+      hd_switcher_menu_update_highlighting (switcher, TRUE);
+    }
+    else
+    {	     
+      hd_switcher_menu_update_highlighting (switcher, FALSE);        
+    }
 
-     if (!switcher->priv->fullscreen)
-       hd_switcher_menu_attach_button (switcher);
+    if (!switcher->priv->fullscreen)
+      hd_switcher_menu_attach_button (switcher);
+
+    n_apps = g_list_length (apps);
+
+    if (n_apps <= SWITCHER_N_SLOTS) 
+      hd_switcher_menu_reset_main_icon (switcher);	    
   }
   else
   {	  
@@ -1206,7 +1217,6 @@
 				  HDEntryInfo *info,
 				  HDSwitcherMenu *switcher)
 {
-#define N_SLOTS 3	
   GtkWidget *menu_item = NULL;
   GList *children = NULL, *apps = NULL, *l;
   gint pos=0;
@@ -1237,7 +1247,7 @@
         }		
      }
 
-     if (pos >= N_SLOTS)
+     if (pos >= SWITCHER_N_SLOTS)
        make_it_blink = TRUE;	    
   }     
   else
@@ -1266,7 +1276,7 @@
        }	       
      }	     
 
-     if (pos >= N_SLOTS)
+     if (pos >= SWITCHER_N_SLOTS)
        make_it_blink = TRUE;	     
   }