the only problematic area - pass NULL for now in as the BonoboUIContainer.

2001-05-11  Chris Toshok  <toshok@ximian.com>

	* 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

1 files changed, 5 insertions, 2 deletions

diff --git a/shell/e-storage-set-view.h b/shell/e-storage-set-view.h
index 361af21721..80bdf441e7 100644
--- a/shell/e-storage-set-view.h
+++ b/shell/e-storage-set-view.h
@@ -25,6 +25,7 @@
 #define __E_STORAGE_SET_VIEW_H__
 
 #include <gal/e-table/e-tree.h>
+#include <bonobo/bonobo-ui-container.h>
 #include "e-storage-set.h"
 
 #ifdef __cplusplus
@@ -68,9 +69,11 @@ struct _EStorageSetViewClass {
 
 
 GtkType     e_storage_set_view_get_type            (void);
-GtkWidget  *e_storage_set_view_new                 (EStorageSet     *storage_set);
+GtkWidget  *e_storage_set_view_new                 (EStorageSet     *storage_set,
+						    BonoboUIContainer *container);
 void        e_storage_set_view_construct           (EStorageSetView *storage_set_view,
-						    EStorageSet     *storage_set);
+						    EStorageSet     *storage_set,
+						    BonoboUIContainer *container);
 void        e_storage_set_view_set_current_folder  (EStorageSetView *storage_set_view,
 						    const char      *path);
 const char *e_storage_set_view_get_current_folder  (EStorageSetView *storage_set_view);