diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-12 01:08:13 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-12 01:08:13 +0800 |
commit | c55ddc508dd4c9b558777f99604050f60b6158d3 (patch) | |
tree | 0c77bf97c02b135f557dca8747e3bebc3d7b32b6 /shell/evolution-activity-client.c | |
parent | 8657f5bbf2ddd4a5118767643e0d3cc97d60f145 (diff) | |
download | gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.gz gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.bz2 gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.lz gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.xz gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.zst gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.zip |
Make separate dispose/finalize overrides of just overriding destroy.
* e-component-registry.c: Make separate dispose/finalize overrides
of just overriding destroy.
* e-corba-config-page.c: Likewise.
* e-corba-storage.c: Likewise.
* e-folder-type-registry.c: Likewise.
* e-folder.c: Likewise.
* e-history.c: Likewise.
* e-local-folder.c: Likewise.
* e-local-storage.c: Likewise.
* e-shell-folder-selection-dialog.c: Likewise.
* e-shell-folder-title-bar.c: Likewise.
* e-shell-offline-handler.c: Likewise.
* e-shell-settings-dialog.c: Likewise.
* e-shell-user-creatable-items-handler.c: Likewise.
* e-shell-view.c: Likewise.
* e-shortcuts-view-model.c: Likewise.
* e-shortcuts-view.c: Likewise.
* e-shortcuts.c: Likewise.
* e-storage-set-view.c: Likewise.
* e-storage-set.c: Likewise.
* e-storage.c: Likewise.
* e-task-bar.c: Likewise.
* e-task-widget.c: Likewise.
* e-uri-schema-registry.c: Likewise.
* evolution-activity-client.c: Likewise.
* evolution-folder-selector-button.c: Likewise.
* evolution-storage-listener.c: Likewise.
* evolution-storage-set-view-listener.c: Likewise.
* evolution-test-component.c: Likewise.
svn path=/trunk/; revision=18695
Diffstat (limited to 'shell/evolution-activity-client.c')
-rw-r--r-- | shell/evolution-activity-client.c | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index 0e78e27cf6..0047091768 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -155,10 +155,10 @@ listener_callback (BonoboListener *listener, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_dispose (GObject *object) { EvolutionActivityClient *activity_client; EvolutionActivityClientPrivate *priv; @@ -167,8 +167,10 @@ impl_destroy (GtkObject *object) activity_client = EVOLUTION_ACTIVITY_CLIENT (object); priv = activity_client->priv; - if (priv->next_update_timeout_id != 0) + if (priv->next_update_timeout_id != 0) { g_source_remove (priv->next_update_timeout_id); + priv->next_update_timeout_id = 0; + } CORBA_exception_init (&ev); @@ -181,30 +183,46 @@ impl_destroy (GtkObject *object) BONOBO_EX_REPOID (&ev)); CORBA_Object_release (priv->activity_interface, &ev); + + priv->activity_interface = CORBA_OBJECT_NIL; } CORBA_exception_free (&ev); - if (priv->listener != NULL) + if (priv->listener != NULL) { bonobo_object_unref (BONOBO_OBJECT (priv->listener)); + priv->listener = NULL; + } - g_free (priv->new_information); + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + EvolutionActivityClient *activity_client; + EvolutionActivityClientPrivate *priv; + activity_client = EVOLUTION_ACTIVITY_CLIENT (object); + priv = activity_client->priv; + + g_free (priv->new_information); g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static void class_init (EvolutionActivityClientClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; parent_class = gtk_type_class (PARENT_TYPE); - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = impl_destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->dispose = impl_dispose; + object_class->finalize = impl_finalize; signals[SHOW_DETAILS] = gtk_signal_new ("show_details", |