Everywhere unref the remote_uih having done a set_container.

svn path=/trunk/; revision=4524

11 files changed, 26 insertions, 2 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f0d9f72438..7e3cc004fc 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-04  Michael Meeks  <michael@helixcode.com>
+
+	* gui/component/addressbook.c (control_activate): unref.
+
+	* demo/addressbook.c (control_activate): unref.
+
 2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
 
 	* contact-editor/e-contact-editor-categories.c,
diff --git a/addressbook/demo/addressbook.c b/addressbook/demo/addressbook.c
index 38cb6c7121..b273788118 100644
--- a/addressbook/demo/addressbook.c
+++ b/addressbook/demo/addressbook.c
@@ -98,6 +98,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih)
 	
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
 	bonobo_ui_handler_set_container (uih, remote_uih);		
+	bonobo_object_release_unref (remote_uih, NULL);
 
 	bonobo_ui_handler_menu_new_item (uih, "/Actions/New Contact", N_("_New Contact"),       
 					 NULL, -1,
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index a4ca8358f3..bf2b054280 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -485,6 +485,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
 	bonobo_ui_handler_set_container (uih, remote_uih);		
+	bonobo_object_release_unref (remote_uih, NULL);
 
 	bonobo_ui_handler_menu_new_separator (uih, "/View/<sep>", -1);
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 09cc75ef4c..1add100fa3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-04  Michael Meeks  <michael@helixcode.com>
+
+	* gui/calendar-commands.c (calendar_control_activate): unref.
+
 2000-08-02  Seth Alves  <alves@hungry.com>
 
 	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index db7b50d25d..eb22b317a2 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -607,6 +607,7 @@ calendar_control_activate (BonoboControl *control,
 
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
 	bonobo_ui_handler_set_container (uih, remote_uih);
+	bonobo_object_release_unref (remote_uih, NULL);
 
 	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,
 				   GTK_TOOLBAR_BOTH);
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5a2e0a0c2d..543655d21f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-04  Michael Meeks  <michael@helixcode.com>
+
+	* folder-browser-factory.c (control_activate): release the ui_handler
+	after set_container.
+
 2000-08-03  Michael Meeks  <michael@helixcode.com>
 
 	* mail-config.c (identity_page_new): only whack the sig in if the
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index b4a705abd0..6a3123b9f9 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -51,7 +51,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 	char *toolbar_name = g_strdup_printf ("/Toolbar%d", fb->serial);
 
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
-	bonobo_ui_handler_set_container (uih, remote_uih);		
+	bonobo_ui_handler_set_container (uih, remote_uih);
+	bonobo_object_release_unref (remote_uih, NULL);
 
 	folder_browser = bonobo_control_get_widget (control);
 
diff --git a/notes/component-factory.c b/notes/component-factory.c
index f416156ba3..3f8176cc9c 100644
--- a/notes/component-factory.c
+++ b/notes/component-factory.c
@@ -43,6 +43,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih)
 
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
 	bonobo_ui_handler_set_container (uih, remote_uih);
+	bonobo_object_release_unref (remote_uih, NULL);
 
 	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,
 				   GTK_TOOLBAR_BOTH);
diff --git a/shell/ChangeLog b/shell/ChangeLog
index eafb4f5b33..e1e38b6a2c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-04  Michael Meeks  <michael@helixcode.com>
 
+	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
+	unref.
+
 	* e-shell.c (e_shell_construct): Remove erroneous refs on
 	folder_type_registry, storage_set.
 
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 8091baf1f4..414b9ddefc 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -482,7 +482,7 @@ destroy (GtkObject *object)
 	g_hash_table_foreach (priv->uri_to_control, hash_forall_destroy_control, NULL);
 	g_hash_table_destroy (priv->uri_to_control);
 
-	bonobo_object_unref (priv->uih);
+	bonobo_object_unref (BONOBO_OBJECT (priv->uih));
 
 	g_free (priv->uri);
 
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index e5d2d9edda..100160503f 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -285,6 +285,7 @@ impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant
 
 	uih = bonobo_ui_handler_new ();
 	bonobo_ui_handler_set_container (uih, corba_uih);
+	bonobo_object_release_unref (corba_uih, NULL);
 
 	(* priv->populate_folder_context_menu_fn) (shell_component, uih, physical_uri, type, priv->closure);