[Xfce4-commits] <xfce4-panel:master> Always wait for a grab if we popup menus from events.

[Nick Schermer]

Updating branch refs/heads/master
         to 62e842ad4fff5fa64d3ab224e3a8845a64133b44 (commit)
       from 7b9a047f9417140659df7dd35e864a5daaf1a9cb (commit)

commit 62e842ad4fff5fa64d3ab224e3a8845a64133b44
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jul 25 14:20:59 2010 +0200

    Always wait for a grab if we popup menus from events.

 plugins/applicationsmenu/applicationsmenu.c |    6 +++---
 plugins/directorymenu/directorymenu.c       |    6 +++---
 plugins/windowmenu/windowmenu.c             |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index b501dbe..7720f56 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -559,15 +559,15 @@ applications_menu_plugin_remote_event (XfcePanelPlugin *panel_plugin,
 
   if (strcmp (name, "popup") == 0
       && GTK_WIDGET_VISIBLE (panel_plugin)
-      && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin->button)))
+      && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin->button))
+      && panel_utils_grab_available ())
     {
       if (value != NULL
           && G_VALUE_HOLDS_BOOLEAN (value)
           && g_value_get_boolean (value))
         {
           /* show menu under cursor */
-          if (panel_utils_grab_available ())
-            applications_menu_plugin_menu (NULL, plugin);
+          applications_menu_plugin_menu (NULL, plugin);
         }
       else
         {
diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index 0502d66..d8edb0c 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -455,15 +455,15 @@ directory_menu_plugin_remote_event (XfcePanelPlugin *panel_plugin,
 
   if (strcmp (name, "popup") == 0
       && GTK_WIDGET_VISIBLE (panel_plugin)
-      && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin->button)))
+      && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin->button))
+      && panel_utils_grab_available ())
     {
       if (value != NULL
           && G_VALUE_HOLDS_BOOLEAN (value)
           && g_value_get_boolean (value))
         {
           /* popup the menu under the pointer */
-          if (panel_utils_grab_available ())
-            directory_menu_plugin_menu (NULL, plugin);
+          directory_menu_plugin_menu (NULL, plugin);
         }
       else
         {
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 09a86cd..b6f9127 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -582,15 +582,15 @@ window_menu_plugin_remote_event (XfcePanelPlugin *panel_plugin,
 
   if (strcmp (name, "popup") == 0
       && GTK_WIDGET_VISIBLE (panel_plugin)
-      && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin->button)))
+      && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin->button))
+      && panel_utils_grab_available ())
     {
       if (value != NULL
           && G_VALUE_HOLDS_BOOLEAN (value)
           && g_value_get_boolean (value))
         {
           /* popup the menu under the pointer */
-          if (panel_utils_grab_available ())
-            window_menu_plugin_menu (NULL, plugin);
+          window_menu_plugin_menu (NULL, plugin);
         }
       else
         {