[Goodies-commits] r2695 - in xfce4-places-plugin/trunk: . panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2007-04-20 21:35:54 +0000 (Fri, 20 Apr 2007)
New Revision: 2695

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
2007-04-20	Diego Ongaro <ongardie at gmail.com>

* view.c: Connects menu deactivate signal only once per menu.
  Registers menu with panel before every popup.



Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2007-04-20 21:31:11 UTC (rev 2694)
+++ xfce4-places-plugin/trunk/ChangeLog	2007-04-20 21:35:54 UTC (rev 2695)
@@ -5,6 +5,8 @@
 	* view.c: Disabled Recent Documents for gtk < v2.10.
 	  Replaced gtk_image_clear() call since it's new in gtk v2.8.
 	  Now using g_object_ref_sink() and g_object_unref() on tooltips.
+	  Connects menu deactivate signal only once per menu.
+	  Registers menu with panel before every popup.
 
 2007-04-14	Diego Ongaro <ongardie at gmail.com>
 

Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c	2007-04-20 21:31:11 UTC (rev 2694)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c	2007-04-20 21:35:54 UTC (rev 2695)
@@ -155,10 +155,6 @@
     // Create a new menu
     pd->view_menu = gtk_menu_new();
     
-    // Register this menu (for auto-hide)
-    xfce_panel_plugin_register_menu(pd->plugin, GTK_MENU(pd->view_menu)); // TODO why does xfdesktop
-                                                                          // do this on every menu opening?
-
     /* make sure the menu popups up in right screen */
     gtk_menu_set_screen (GTK_MENU (pd->view_menu),
                          gtk_widget_get_screen (GTK_WIDGET (pd->plugin)));
@@ -192,6 +188,10 @@
     gtk_menu_shell_append(GTK_MENU_SHELL(pd->view_menu), recent_item);
 #endif
 
+    /* connect deactivate signal */
+    g_signal_connect_swapped(pd->view_menu, "deactivate",
+                             G_CALLBACK(places_view_cb_menu_deact), pd);
+
     // Quit hiding the menu
     gtk_widget_show_all(pd->view_menu);
 
@@ -210,10 +210,8 @@
     /* toggle the button */
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pd->view_button), TRUE);
 
-    /* connect deactivate signal */
-    g_signal_connect_swapped(pd->view_menu, "deactivate",
-                             G_CALLBACK(places_view_cb_menu_deact), pd);
-    // TODO: in xfdesktop, why do sig_id stuff? why guint, then int? gulong is what it uses
+    // Register this menu (for focus, transparency, auto-hide, etc)
+    xfce_panel_plugin_register_menu(pd->plugin, GTK_MENU(pd->view_menu));
 
     /* popup menu */
     gtk_menu_popup (GTK_MENU (pd->view_menu), NULL, NULL,