From 7da5a58462520d93415418c258acf0cb73972977 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 11 May 2001 11:14:45 +0000 Subject: the only problematic area - pass NULL for now in as the BonoboUIContainer. 2001-05-11 Chris Toshok * evolution-storage-set-view-factory.c (evolution_storage_set_view_factory_new_view): the only problematic area - pass NULL for now in as the BonoboUIContainer. how do we pass this container to the control? * e-storage-set-view.c (folder_context_menu_activate): un-#if 0 this function. (populate_folder_context_menu_with_common_items): build our popup using the new xml bonobo stuffs. (popup_folder_menu): convert to using the new xml bonobo stuffs. (right_click): only do the popup menu if we have a BonoboUIContainer. (e_storage_set_view_new): add BonoboUIContainer* arg. (e_storage_set_view_construct): same. * e-storage-set-view.h: add BonoboUIContainer* args to e_storage_set_view_new and e_storage_set_view_construct. * e-shell-folder-creation-dialog.c (add_storage_set_view): pass NULL for the BonoboUIContainer, since we shouldn't (?) have a popup in this dialog. * e-shell-folder-selection-dialog.c (e_shell_folder_selection_dialog_construct): pass NULL for the BonoboUIContainer, since we shouldn't (?) have a popup in this dialog. * e-storage-set.h: add BonoboUIContainer* arg to e_storage_set_new_view. * e-storage-set.c (e_storage_set_new_view): add arg, and track change to e_storage_set_view_new. * e-shell-view.h: add prototype for e_shell_view_get_bonobo_ui_container. * e-shell-view.c (setup_storage_set_subwindow): track change to e_storage_set_view_new. (e_shell_view_construct): the BonoboUIContainer is now part of our private structure. (e_shell_view_get_bonobo_ui_container): new function. svn path=/trunk/; revision=9756 --- shell/evolution-storage-set-view-factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shell/evolution-storage-set-view-factory.c') diff --git a/shell/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c index 93359def10..ee71776186 100644 --- a/shell/evolution-storage-set-view-factory.c +++ b/shell/evolution-storage-set-view-factory.c @@ -44,7 +44,7 @@ evolution_storage_set_view_factory_new_view (EShell *shell) g_return_val_if_fail (E_IS_SHELL (shell), NULL); storage_set = e_shell_get_storage_set (shell); - storage_set_view = e_storage_set_view_new (storage_set); + storage_set_view = e_storage_set_view_new (storage_set, NULL /*XXX*/); gtk_widget_show (storage_set_view); storage_set_view_interface = evolution_storage_set_view_new (E_STORAGE_SET_VIEW (storage_set_view)); -- cgit v1.2.3