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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-29 17:35:03 +0300 (Wed, 29 Aug 2007)
New Revision: 13471

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

	* src/hd-switcher-menu.c (hd_switcher_menu_changed_info_cb): correctly
	calculate the position of an window in the stack in order to avoid
	blinking window icons both in switcher are and switcher menu.
	Fixes NB#57680.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-29 13:29:56 UTC (rev 13470)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-29 14:35:03 UTC (rev 13471)
@@ -1,5 +1,12 @@
-2007-08-29  Karoliina Salminen <karoliina.t.salminen at nokia.com>
+2007-08-29  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c (hd_switcher_menu_changed_info_cb): correctly
+	calculate the position of an window in the stack in order to avoid
+	blinking window icons both in switcher are and switcher menu.
+	Fixes NB#57680.
+
+2007-08-29  Karoliina Salminen  <karoliina.t.salminen at nokia.com>
+
 	* Fixed signedness problem on libhildonmenu.c on line 1013: added cast to empty
 	string to get rid of warning (which is treated as error) which blocked compilation
 	on Ubuntu Gutsy. This fixes NB#67207.

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-29 13:29:56 UTC (rev 13470)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-29 14:35:03 UTC (rev 13471)
@@ -1925,55 +1925,60 @@
   
   if (HD_WM_IS_APPLICATION (info))
   {	  
-     apps = hd_wm_get_applications (switcher->hdwm);
+    apps = hd_wm_get_applications (switcher->hdwm);
 
-     for (l = apps; l != NULL; l = g_list_next (l))
-     {
-        HDWMEntryInfo *iter_info = (HDWMEntryInfo *) l->data;
+    for (l = apps; l != NULL; l = g_list_next (l))
+    {
+       HDWMEntryInfo *iter_info = (HDWMEntryInfo *) l->data;
 
-	if (!HD_WM_IS_APPLICATION (iter_info))
-          continue;
- 	
-        if (HD_WM_IS_APPLICATION (iter_info))		
-        {
-	  pos++;
+       if (HD_WM_IS_APPLICATION (iter_info))		
+       {
+         pos++;
 
-	  if (iter_info == info)
-            break;		  
-        }		
-     }
+         if (iter_info == info)
+           break;		  
+       }
+       else
+       {
+         continue;
+       }
+       
+    }
 
-     if (pos >= SWITCHER_N_SLOTS)
-       make_it_blink = TRUE;	    
+    if (pos >= SWITCHER_N_SLOTS)
+      make_it_blink = TRUE;	    
   }     
   else
   {
-     apps = hd_wm_get_applications (switcher->hdwm);
+    apps = hd_wm_get_applications (switcher->hdwm);
 
-     for (l = apps; l != NULL; l = g_list_next (l))
-     {
-       const GList *iter_children;	     
-       HDWMEntryInfo *iter_info = (HDWMEntryInfo *) l->data;
-       
-       if (HD_WM_IS_APPLICATION (iter_info))
-       {
-         pos++;	
-  	 
-         const GList *info_children = 
-  	   hd_wm_entry_info_get_children (iter_info);
-	 
-	 for (iter_children = info_children; 
- 	      iter_children != NULL; 
-	      iter_children = g_list_next (iter_children))
-         {
-           if (iter_children->data == info)
-	     break;	   
-         }		 
-       }	       
-     }	     
+    for (l = apps; l != NULL; l = g_list_next (l))
+    {
+      HDWMEntryInfo *iter_info = (HDWMEntryInfo *) l->data;
+      const GList *iter_children;	     
+      
+      if (HD_WM_IS_APPLICATION (iter_info))
+      {
+        pos++;	
+        
+        const GList *info_children = 
+          hd_wm_entry_info_get_children (iter_info);
+        
+        for (iter_children = info_children; 
+             iter_children != NULL; 
+             iter_children = g_list_next (iter_children))
+        {
+          if (iter_children->data == info)
+            break;   
+        }
 
-     if (pos >= SWITCHER_N_SLOTS)
-       make_it_blink = TRUE;	     
+        if (!iter_children)
+          break;
+      }	       
+    }
+
+    if (pos >= SWITCHER_N_SLOTS)
+      make_it_blink = TRUE;	     
   }	  
 	  
   children =