[Goodies-commits] r7198 - in xfce4-clipman-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2009-04-14 11:10:03 +0000 (Tue, 14 Apr 2009)
New Revision: 7198

Modified:
   xfce4-clipman-plugin/trunk/ChangeLog
   xfce4-clipman-plugin/trunk/panel-plugin/main.c
Log:
Block status icon popup menu if settings dialog is open

Modified: xfce4-clipman-plugin/trunk/ChangeLog
===================================================================
--- xfce4-clipman-plugin/trunk/ChangeLog	2009-04-14 07:50:24 UTC (rev 7197)
+++ xfce4-clipman-plugin/trunk/ChangeLog	2009-04-14 11:10:03 UTC (rev 7198)
@@ -1,4 +1,10 @@
 2009-04-13	Mike Massonnet
+Block status icon popup menu if settings dialog is open
+
+	- panel-plugin/main.c(cb_status_icon_popup_menu):
+		Don't popup the menu if the settings dialog is open.
+
+2009-04-13	Mike Massonnet
 Forgot the desktop entry files
 
 	- panel-plugin/xfce4-clipman-plugin.desktop.in.in,

Modified: xfce4-clipman-plugin/trunk/panel-plugin/main.c
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/main.c	2009-04-14 07:50:24 UTC (rev 7197)
+++ xfce4-clipman-plugin/trunk/panel-plugin/main.c	2009-04-14 11:10:03 UTC (rev 7198)
@@ -299,6 +299,9 @@
 {
   GtkWidget *mi;
 
+  if (plugin->gxml != NULL)
+    return;
+
   if (G_UNLIKELY (plugin->popup_menu == NULL))
     {
       plugin->popup_menu = gtk_menu_new ();
@@ -317,6 +320,7 @@
       gtk_menu_shell_append (GTK_MENU_SHELL (plugin->popup_menu), mi);
       gtk_widget_show_all (plugin->popup_menu);
     }
+
   gtk_menu_set_screen (GTK_MENU (plugin->popup_menu), gtk_status_icon_get_screen (plugin->status_icon));
   gtk_menu_popup (GTK_MENU (plugin->popup_menu), NULL, NULL,
                   (GtkMenuPositionFunc)NULL, NULL,