diff options
| author | Chris Toshok <toshok@ximian.com> | 2001-05-12 07:13:28 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2001-05-12 07:13:28 +0800 |
| commit | 12de520a89398e2c9810f042b3d10e3c4c1ed1ef (patch) | |
| tree | 6626fe96e3af79f36693ab8f3f2831bb7dec3c3b /shell/e-storage-set-view.c | |
| parent | 19f8760e0dd3e2fb0595699e825936752e880ec8 (diff) | |
| download | gsoc2013-evolution-12de520a89398e2c9810f042b3d10e3c4c1ed1ef.tar.gz gsoc2013-evolution-12de520a89398e2c9810f042b3d10e3c4c1ed1ef.tar.zst gsoc2013-evolution-12de520a89398e2c9810f042b3d10e3c4c1ed1ef.zip | |
add this define for the xml path to use when adding menu items to the
2001-05-11 Chris Toshok <toshok@ximian.com>
* evolution-shell-component.h
(EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER): add this define for
the xml path to use when adding menu items to the folder popup.
* e-storage-set-view.c
(populate_folder_context_menu_with_common_items): add (#ifdef
DEBUG_XML) a menu item to dump the bonobo xml.
(popup_folder_menu): pass the BonoboUIContainer to the
populate_folder_context_menu CORBA call, instead of the component.
Also, reorder things a bit so the component doesn't get an error
when setting xml the first time.
svn path=/trunk/; revision=9777
Diffstat (limited to 'shell/e-storage-set-view.c')
| -rw-r--r-- | shell/e-storage-set-view.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index a72c3881fd..2a51735854 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -49,6 +49,8 @@ static char *list [] = { }; #endif +/*#define DEBUG_XML*/ + #define DRAG_RESISTANCE 3 /* FIXME hardcoded in ETable to this value as * well, and there is no way for us to use the * same value as it's not exported. */ @@ -652,6 +654,10 @@ populate_folder_context_menu_with_common_items (EStorageSetView *storage_set_vie "<submenu name=\"Folder\" _label=\"Folder\">\n" " <menuitem name=\"Activate\" verb=\"ActivateView\" _label=\"_View\" _tip=\"View the selected folder\"/>\n" " <placeholder name=\"componentPlaceholder\" delimit=\"top\"/>\n" +#ifdef DEBUG_XML + " <separator/>\n" + " <menuitem name=\"Dump\" verb=\"BonoboUIDump\" _label=\"_Dump XML\" _tip=\"Dump the bonobo xml\"/>\n" +#endif "</submenu>\n"; bonobo_ui_component_add_verb (uih, "ActivateView", @@ -695,11 +701,6 @@ popup_folder_menu (EStorageSetView *storage_set_view, bonobo_ui_component_set (uih, "/", "<popups> <popup name=\"folderPopup\"/> </popups>", NULL); - evolution_shell_component_client_populate_folder_context_menu (handler, - uih, - e_folder_get_physical_uri (folder), - e_folder_get_type_string (folder)); - populate_folder_context_menu_with_common_items (storage_set_view, uih); menu = gtk_menu_new (); @@ -707,6 +708,11 @@ popup_folder_menu (EStorageSetView *storage_set_view, bonobo_window_add_popup (bonobo_ui_container_get_win (priv->container), GTK_MENU (menu), "/popups/folderPopup"); + evolution_shell_component_client_populate_folder_context_menu (handler, + priv->container, + e_folder_get_physical_uri (folder), + e_folder_get_type_string (folder)); + gtk_widget_show (GTK_WIDGET (menu)); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, 0); |