callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create an Items placeholder under ComponentPlaceholder, and then

Browse Source 
* 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
This commit is contained in:
Ettore Perazzoli
2002-09-03 20:28:29 +00:00
parent 7140264bb8
commit 2c29a42ba0
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shell/ChangeLog
View File

@ -1,3 +1,14 @@
2002-09-03 Ettore Perazzoli <ettore@ximian.com>
* 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 <ettore@ximian.com> 2002-09-03 Ettore Perazzoli <ettore@ximian.com>
* e-shell-importer.c (show_import_wizard): Make the WM close * e-shell-importer.c (show_import_wizard): Make the WM close

6
shell/e-storage-set-view.c
View File

@ -785,6 +785,10 @@ popup_folder_menu (EStorageSetView *storage_set_view,
bonobo_window_add_popup (bonobo_ui_container_get_win (priv->ui_container), bonobo_window_add_popup (bonobo_ui_container_get_win (priv->ui_container),
GTK_MENU (menu), "/popups/FolderPopup"); GTK_MENU (menu), "/popups/FolderPopup");
bonobo_ui_component_set (priv->ui_component,
"/popups/FolderPopup/ComponentPlaceholder",
"<placeholder name=\"Items\"/>", NULL);
if (handler != NULL) if (handler != NULL)
evolution_shell_component_client_populate_folder_context_menu (handler, evolution_shell_component_client_populate_folder_context_menu (handler,
priv->ui_container, priv->ui_container,
@ -800,6 +804,8 @@ popup_folder_menu (EStorageSetView *storage_set_view,
if (folder_property_items_data != NULL) if (folder_property_items_data != NULL)
remove_property_items (storage_set_view, folder_property_items_data); 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)); gtk_widget_destroy (GTK_WIDGET (menu));
e_tree_right_click_up (E_TREE (storage_set_view)); e_tree_right_click_up (E_TREE (storage_set_view));

2
shell/evolution-shell-component.h
View File

@ -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(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_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; typedef struct _EvolutionShellComponent EvolutionShellComponent;