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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-16 16:09:59 +0300 (Thu, 16 Aug 2007)
New Revision: 13264

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

	* src/hd-switcher-menu.c (hd_switcher_menu_toggled_cb,
	hd_switcher_menu_show_menu_cb): Do not popup window again when menu is
	already opened and the next running application is activated. 


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-16 13:05:09 UTC (rev 13263)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-16 13:09:59 UTC (rev 13264)
@@ -1,5 +1,11 @@
 2007-08-16  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c (hd_switcher_menu_toggled_cb,
+	hd_switcher_menu_show_menu_cb): Do not popup window again when menu is
+	already opened and the next running application is activated. 
+
+2007-08-16  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-home-titlebar.c
 	(hildon_home_titlebar_set_menu): do not detach menu because it was
 	never attached anywhere.

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-16 13:05:09 UTC (rev 13263)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-16 13:09:59 UTC (rev 13264)
@@ -872,7 +872,7 @@
 		  		    	     "item-height", 72,
 		  		    	     "parent", switcher->priv->popup_window,
 				    	     NULL));	    
-
+  
   switcher->priv->menu_notifications =
     HILDON_DESKTOP_POPUP_MENU (g_object_new (HILDON_DESKTOP_TYPE_POPUP_MENU,
 		  			     "item-height", 72,
@@ -1511,6 +1511,7 @@
   {	  
     hildon_desktop_popup_menu_select_next_item (switcher->priv->menu_applications);
     hd_wm_debug ("selecting next item");
+    return;
   }
     
   hildon_desktop_popup_window_popup 
@@ -2138,7 +2139,7 @@
          (switcher->priv->menu_applications));
   }
   else
-    hd_wm_top_desktop ();
+    hd_wm_toggle_desktop ();
 }
 
 static void