diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-06 02:18:42 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-06 02:18:42 +0800 |
| commit | 0e595276e5b32beae2a10ad3deb47a802866326f (patch) | |
| tree | f614933b1030304ca477a75602d0cb2cbd91ca8d /shell/e-activity-handler.c | |
| parent | 99c2d72b9971cabfb736e2547f5b57f48fafa354 (diff) | |
| download | gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.gz gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.zst gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.zip | |
Split finalize/dispose. Likewise. Likewise. Likewise. Likewise. Likewise.
* e-activity-handler.c: Split finalize/dispose.
* e-corba-shortcuts.c: Likewise.
* e-corba-storage-registry.c: Likewise.
* e-shell-about-box.c: Likewise.
* e-shell.c: Likewise.
* e-splash.c: Likewise.
* evolution-config-control.c: Likewise.
* evolution-session.c: Likewise.
* evolution-shell-component.c: Likewise.
* evolution-shell-view.c: Likewise.
* evolution-storage-set-view.c: Likewise.
* evolution-storage.c: Likewise.
* evolution-wizard.c: Likewise.
svn path=/trunk/; revision=18556
Diffstat (limited to 'shell/e-activity-handler.c')
| -rw-r--r-- | shell/e-activity-handler.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c index e0002af2df..aab5216e69 100644 --- a/shell/e-activity-handler.c +++ b/shell/e-activity-handler.c @@ -327,7 +327,7 @@ task_bar_destroy_callback (GtkObject *task_bar_object, /* GObject methods. */ static void -impl_finalize (GObject *object) +impl_dispose (GObject *object) { EActivityHandler *handler; EActivityHandlerPrivate *priv; @@ -343,8 +343,22 @@ impl_finalize (GObject *object) activity_info_free (info); } + g_list_free (priv->activity_infos); + priv->activity_infos = NULL; + + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + EActivityHandler *handler; + EActivityHandlerPrivate *priv; + + handler = E_ACTIVITY_HANDLER (object); + priv = handler->priv; + g_free (priv); - handler->priv = NULL; (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -516,6 +530,7 @@ class_init (GObjectClass *object_class) parent_class = gtk_type_class (PARENT_TYPE); + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; handler_class = E_ACTIVITY_HANDLER_CLASS (object_class); |