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/e-storage-set-view.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'shell/e-storage-set-view.c') 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)); -- cgit v1.2.3