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/evolution-config-control.c | |
| parent | 99c2d72b9971cabfb736e2547f5b57f48fafa354 (diff) | |
| download | gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.gz gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.bz2 gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.lz gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.xz 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/evolution-config-control.c')
| -rw-r--r-- | shell/evolution-config-control.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index a803880772..2036cca249 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -53,7 +53,7 @@ static int signals[LAST_SIGNAL] = { 0 }; /* GObject methods. */ static void -impl_finalize (GObject *object) +impl_dispose (GObject *object) { EvolutionConfigControl *config_control; EvolutionConfigControlPrivate *priv; @@ -61,14 +61,30 @@ impl_finalize (GObject *object) config_control = EVOLUTION_CONFIG_CONTROL (object); priv = config_control->priv; - if (priv != NULL) { + if (priv->control != NULL) { bonobo_object_unref (BONOBO_OBJECT (priv->control)); - bonobo_object_unref (BONOBO_OBJECT (priv->event_source)); + priv->control = NULL; + } - g_free (priv); - config_control->priv = NULL; + if (priv->event_source != NULL) { + bonobo_object_unref (BONOBO_OBJECT (priv->event_source)); + priv->event_source = NULL; } + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + EvolutionConfigControl *config_control; + EvolutionConfigControlPrivate *priv; + + config_control = EVOLUTION_CONFIG_CONTROL (object); + priv = config_control->priv; + + g_free (priv); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -128,6 +144,7 @@ class_init (EvolutionConfigControlClass *class) GObjectClass *object_class; object_class = G_OBJECT_CLASS (class); + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; epv = &class->epv; |