aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-view.c12
2 files changed, 16 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 68440fa2b5..563a1399dd 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-29 JP Rosevear <jpr@ximian.com>
+
+ * e-shell-view.c (setup_progress_bar): unref the control when
+ finished with it
+ (setup_offline_toggle): ditto
+ (destroy): destroy offline and progress widgets
+
2001-05-28 Dan Winship <danw@ximian.com>
* e-storage-set-view.c (new_storage_cb): Call
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index d2c5159620..8da4b53dc9 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -641,9 +641,10 @@ setup_offline_toggle (EShellView *shell_view)
g_return_if_fail (control != NULL);
bonobo_ui_component_object_set (priv->ui_component, "/status/OfflineToggle",
- bonobo_object_corba_objref (BONOBO_OBJECT (control)),
+ BONOBO_OBJREF (control),
NULL);
-
+ bonobo_object_unref (control);
+
priv->offline_toggle = toggle;
priv->offline_toggle_pixmap = pixmap;
@@ -671,8 +672,9 @@ setup_progress_bar (EShellView *shell_view)
g_return_if_fail (control != NULL);
bonobo_ui_component_object_set (priv->ui_component, "/status/Progress",
- bonobo_object_corba_objref (BONOBO_OBJECT (control)),
+ BONOBO_OBJREF (control),
NULL);
+ bonobo_object_unref (control);
}
static void
@@ -807,6 +809,10 @@ destroy (GtkObject *object)
g_hash_table_foreach (priv->uri_to_control, hash_forall_destroy_control, NULL);
g_hash_table_destroy (priv->uri_to_control);
+ gtk_widget_destroy (priv->offline_toggle);
+ gtk_widget_destroy (priv->offline_toggle_pixmap);
+ gtk_widget_destroy (priv->progress_bar);
+
bonobo_object_unref (BONOBO_OBJECT (priv->ui_component));
g_free (priv->uri);