once we have the bonobo control widget, disable the autoactivation and

2000-03-13  bertrand  <bertrand@helixcode.com>

	* shell/e-shell-view.c (get_view):
	once we have the bonobo control widget,
	disable the autoactivation and activate
	the control frame.

2000-03-12  bertrand  <bertrand@helixcode.com>

	* folder-browser-factory.c (folder_browser_factory_init):
	name change.
	(control_activate_cb): when the control is activated,
	it merges its own UI with the remote UIHandler.
	(control_add_menu): sample menu merging.
	(folder_browser_factory): connect the control "activate" signal.


(Bonobo control / shell view) UIMenu merging.

svn path=/trunk/; revision=2110

1 files changed, 38 insertions, 0 deletions

diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 197cb833ed..ce6dfb4750 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -94,6 +94,39 @@ development_warning ()
 	
 } 
 
+
+
+static void 
+control_add_menu (BonoboControl *control)
+{
+	Bonobo_UIHandler  remote_uih;
+	BonoboUIHandler  *uih;
+
+	uih = bonobo_control_get_ui_handler (control);
+	g_assert (uih);
+	
+	remote_uih = bonobo_control_get_remote_ui_handler (control);
+	bonobo_ui_handler_set_container (uih, remote_uih);		
+	
+	bonobo_ui_handler_menu_new_item (uih,
+					 "/File/Stuff", N_("_Stuff"), NULL, -1,
+					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, 0, 0,
+					 NULL, NULL);
+	
+}
+
+
+static void
+control_activate_cb (BonoboControl *control, 
+		     gboolean activate, 
+		     gpointer user_data)
+{
+	control_add_menu (control);
+	
+}
+
+
+
 /*
  * Creates the Folder Browser, wraps it in a Bonobo Control, and
  * sets the Bonobo Control properties to point to the Folder Browser
@@ -106,6 +139,7 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure)
 	GtkWidget *folder_browser;
 	gint warning_result;
 
+
 	warning_result = development_warning ();
 	
 	if (warning_result) 
@@ -127,6 +161,10 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure)
 		return NULL;
 	}
 	
+	gtk_signal_connect (GTK_OBJECT (control), "activate", control_activate_cb, NULL);
+	
+
+
 	
 	bonobo_control_set_property_bag (control,
 					 FOLDER_BROWSER (folder_browser)->properties);