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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-03-28 16:22:42 +0300 (Wed, 28 Mar 2007)
New Revision: 10807

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
Log:

	* src/hn-app-switcher:
        - Fixed navigation through swap key when is highest element.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-28 11:37:58 UTC (rev 10806)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-28 13:22:42 UTC (rev 10807)
@@ -1,5 +1,10 @@
 2007-03-28  Moises Martinez  <moises.martinez at nokia.com>
 
+	* src/hn-app-switcher:
+	- Fixed navigation through swap key when is highest element.
+
+2007-03-28  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hn-app-switcher.c: 
 	- Handling of swap key fixed.
 	- Open thumb menu when swap key pressed.

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-03-28 11:37:58 UTC (rev 10806)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-03-28 13:22:42 UTC (rev 10807)
@@ -311,15 +311,23 @@
 	  l->data != app_switcher->priv->main_home_item)
       {
         GtkWidget *item;
-	      
-        if ((l->next)->data)
+	
+        if (l->next && (l->next)->data)
           item = GTK_WIDGET ((l->next)->data);        		
 	else
 	  item = app_switcher->priv->main_home_item;
 
+	if (GTK_IS_SEPARATOR_MENU_ITEM (item))
+        {		
+	  app_switcher->priv->active_menu_item = item;
+          continue;
+	}
+
 	app_switcher->priv->active_menu_item = item;
 	
         gtk_menu_shell_select_item (GTK_MENU_SHELL (app_switcher->priv->main_menu), item);	      
+	g_debug ("home %p item %p",app_switcher->priv->main_home_item,item);
+	break;
       }
       else 
       if (l->data == app_switcher->priv->main_home_item &&
@@ -329,6 +337,7 @@
 			            GTK_WIDGET (children->data));
 
 	app_switcher->priv->active_menu_item = GTK_WIDGET (children->data);
+	break;
       }
    }