From 2c29a42ba04ca27a286a1dcfd0d9f0642c68f39c Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 3 Sep 2002 20:28:29 +0000 Subject: Create an Items placeholder under ComponentPlaceholder, and then * e-storage-set-view.c (popup_folder_menu): Create an Items placeholder under ComponentPlaceholder, and then bonobo_ui_component_rm() it after we are done with the menu. This -should- fix #29782, but it doesn't. I am not sure why. * evolution-shell-component.h (EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER): Append a "/Items" part. svn path=/trunk/; revision=17952 --- shell/ChangeLog | 11 +++++++++++ shell/e-storage-set-view.c | 6 ++++++ shell/evolution-shell-component.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index f467592c2f..6d4f8262cd 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2002-09-03 Ettore Perazzoli + + * e-storage-set-view.c (popup_folder_menu): Create an Items + placeholder under ComponentPlaceholder, and then + bonobo_ui_component_rm() it after we are done with the menu. This + -should- fix #29782, but it doesn't. I am not sure why. + + * evolution-shell-component.h + (EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER): Append a "/Items" + part. + 2002-09-03 Ettore Perazzoli * e-shell-importer.c (show_import_wizard): Make the WM close diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index ed9c53286c..9a542b4e69 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -785,6 +785,10 @@ popup_folder_menu (EStorageSetView *storage_set_view, bonobo_window_add_popup (bonobo_ui_container_get_win (priv->ui_container), GTK_MENU (menu), "/popups/FolderPopup"); + bonobo_ui_component_set (priv->ui_component, + "/popups/FolderPopup/ComponentPlaceholder", + "", NULL); + if (handler != NULL) evolution_shell_component_client_populate_folder_context_menu (handler, priv->ui_container, @@ -800,6 +804,8 @@ popup_folder_menu (EStorageSetView *storage_set_view, if (folder_property_items_data != NULL) remove_property_items (storage_set_view, folder_property_items_data); + bonobo_ui_component_rm (priv->ui_component, EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER "/ChangeFolderPropertiesPopUp", NULL); + gtk_widget_destroy (GTK_WIDGET (menu)); e_tree_right_click_up (E_TREE (storage_set_view)); diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h index fafa489c8e..1689c59822 100644 --- a/shell/evolution-shell-component.h +++ b/shell/evolution-shell-component.h @@ -43,7 +43,7 @@ extern "C" { #define EVOLUTION_IS_SHELL_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SHELL_COMPONENT)) #define EVOLUTION_IS_SHELL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SHELL_COMPONENT)) -#define EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER "/popups/FolderPopup/ComponentPlaceholder" +#define EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER "/popups/FolderPopup/ComponentPlaceholder/Items" typedef struct _EvolutionShellComponent EvolutionShellComponent; -- cgit v1.2.3