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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-08-01 17:29:26 +0300 (Wed, 01 Aug 2007)
New Revision: 12983

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-08-01  Moises Martinez  <moises.martinez at nokia.com>

        * libhildondesktop/hildon-desktop-popup-window.c:
        (hildon_desktop_popup_window_composited_leave_notify):
        - Check if the menu has been already closed in order to not grab
        anything just when we don't have to.
        * src/hd-switcher-menu.c: (hd_switcher_menu_toggled_cb):
        - Don't call popdown if not necessary.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-01 13:18:08 UTC (rev 12982)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-01 14:29:26 UTC (rev 12983)
@@ -1,3 +1,12 @@
+2007-08-01  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-popup-window.c:
+	(hildon_desktop_popup_window_composited_leave_notify):
+	- Check if the menu has been already closed in order to not grab
+	anything just when we don't have to.
+	* src/hd-switcher-menu.c: (hd_switcher_menu_toggled_cb):
+	- Don't call popdown if not necessary.
+
 2007-08-01  Johan Bilien  <johan.bilien at nokia.com>
 
 	* background-manager/hbm-background.c:

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2007-08-01 13:18:08 UTC (rev 12982)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2007-08-01 14:29:26 UTC (rev 12983)
@@ -509,6 +509,9 @@
 {
   gint w,h,x,y,i;
   gboolean in_panes_area = FALSE;
+
+  if (!popup->priv->open)
+    return TRUE;	  
   
   for (i=0; i < popup->priv->n_extra_panes; i++)
   {

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-01 13:18:08 UTC (rev 12982)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-01 14:29:26 UTC (rev 12983)
@@ -1438,7 +1438,8 @@
 
   if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (switcher->priv->toggle_button)))
   {
-    hildon_desktop_popup_window_popdown (switcher->priv->popup_window);
+    if (switcher->priv->is_open)	  
+      hildon_desktop_popup_window_popdown (switcher->priv->popup_window);
     switcher->priv->is_open = FALSE;
     return;
   }