diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-09-05 00:05:35 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-09-05 00:05:35 +0800 |
| commit | ddaa0af2ceba5de217424eeddfa3f650049ddfa1 (patch) | |
| tree | dde4bded2ee16494bb4862632df9e346269631af /shell/e-storage-set-view.c | |
| parent | a52720a9213d760bb8a9c21b354ab46de7b763dd (diff) | |
| download | gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.tar gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.tar.gz gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.tar.bz2 gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.tar.lz gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.tar.xz gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.tar.zst gsoc2013-evolution-ddaa0af2ceba5de217424eeddfa3f650049ddfa1.zip | |
Pass NULL as @unpopulate_folder_context_menu_fn to
* gui/component/addressbook-component.c (create_component): Pass
NULL as @unpopulate_folder_context_menu_fn to
evolution_shell_component_new().
* gui/component-factory.c (create_object): Pass NULL as
@unpopulate_folder_context_menu_fn to
evolution_shell_component_new().
* mail-account-gui.c (mail_account_gui_save): Remove unused
variable.
* component-factory.c (unpopulate_folder_context_menu): New.
(create_component): Pass it to evolution_shell_component_new().
* component-factory.c (create_component): Pass NULL as
@unpopulate_folder_context_menu_fn to
evolution_shell_component_new().
* e-storage-set-view.c (popup_folder_menu): Remove the context
menu items using
evolution_shell_component_client_unpopulate_folder_context_menu()
instead of doing it ourself, since BonoboUI sucks.
* evolution-shell-component-client.c
(evolution_shell_component_client_unpopulate_folder_context_menu):
New.
* evolution-test-component.c (register_component): Pass NULL as
@unpopulate_folder_context_menu_fn to
evolution_shell_component_new().
* evolution-shell-component.c: New member
unpopulate_folder_context_menu_fn in
EvolutionShellComponentPrivate. New member uic in
EvolutionShellComponentPrivate.
(init): Init new members to NULL.
(destroy): bonobo_object_unref() priv->uic if not NULL.
(evolution_shell_component_new): New arg
@unpopulate_folder_context_menu_fn.
(evolution_shell_component_construct): Likewise.
(impl_populateFolderContextMenu): Set priv->uic to the newly
created UIComponent.
(impl_unpopulateFolderContextMenu): New, implementation for the
::unpopulateFolderContextMenu CORBA method.
(class_init): Install.
* Evolution-ShellComponent.idl (unpopulateFolderContextMenu): New
method.
(AlreadyPopulated): New exception.
(populateFolderContextMenu): Can raise it.
(NotPopulated): New exception.
svn path=/trunk/; revision=17963
Diffstat (limited to 'shell/e-storage-set-view.c')
| -rw-r--r-- | shell/e-storage-set-view.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 872da97eba..0b8b7642a9 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -804,7 +804,11 @@ 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, NULL); + if (handler != NULL) + evolution_shell_component_client_unpopulate_folder_context_menu (handler, + priv->ui_container, + e_folder_get_physical_uri (folder), + e_folder_get_type_string (folder)); gtk_widget_destroy (GTK_WIDGET (menu)); |