[Goodies-commits] r3004 - in xfce4-places-plugin/trunk: . panel-plugin
Diego Ongaro
ongardie at xfce.org
Sat Aug 18 08:33:27 CEST 2007
Author: ongardie
Date: 2007-08-18 06:33:27 +0000 (Sat, 18 Aug 2007)
New Revision: 3004
Modified:
xfce4-places-plugin/trunk/ChangeLog
xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
2007-08-18 Diego Ongaro <ongardie at gmail.com>
* view.c: Fix bug 3471 (Rightclick action pins autohidden panel)
Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog 2007-08-17 18:41:37 UTC (rev 3003)
+++ xfce4-places-plugin/trunk/ChangeLog 2007-08-18 06:33:27 UTC (rev 3004)
@@ -1,3 +1,7 @@
+2007-08-18 Diego Ongaro <ongardie at gmail.com>
+
+ * view.c: Fix bug 3471 (Rightclick action pins autohidden panel)
+
2007-08-15 Diego Ongaro <ongardie at gmail.com>
* Prep for v0.9.991 (1.0beta1)
Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c 2007-08-17 18:41:37 UTC (rev 3003)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c 2007-08-18 06:33:27 UTC (rev 3004)
@@ -357,8 +357,10 @@
/* toggle the button */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pd->view_button), TRUE);
- // Register this menu (for focus, transparency, auto-hide, etc)
- xfce_panel_plugin_register_menu(pd->plugin, GTK_MENU(pd->view_menu));
+ /* Register this menu (for focus, transparency, auto-hide, etc) */
+ /* We don't want to register if the menu is visible (hasn't been deactivated) */
+ if(!GTK_WIDGET_VISIBLE(pd->view_menu))
+ xfce_panel_plugin_register_menu(pd->plugin, GTK_MENU(pd->view_menu));
/* popup menu */
gtk_menu_popup (GTK_MENU (pd->view_menu), NULL, NULL,
@@ -371,7 +373,7 @@
places_view_destroy_menu(PlacesData *pd)
{
if(pd->view_menu != NULL){
- g_signal_emit_by_name(G_OBJECT(pd->view_menu), "deactivate");
+ gtk_menu_shell_deactivate(GTK_MENU_SHELL(pd->view_menu));
gtk_widget_destroy(pd->view_menu);
pd->view_menu = NULL;
}
@@ -587,7 +589,7 @@
g_assert(pd->view_menu != NULL && GTK_IS_WIDGET(pd->view_menu));
/* we want the menu gone - now - since it prevents mouse grabs */
- gtk_widget_hide(pd->view_menu);
+ gtk_menu_shell_deactivate(GTK_MENU_SHELL(pd->view_menu));
while(g_main_context_iteration(NULL, FALSE))
/* no op */;
More information about the Goodies-commits
mailing list