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-corba-shortcuts.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/e-corba-shortcuts.c')
| -rw-r--r-- | shell/e-corba-shortcuts.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c index 6412d9e69d..8ebeeac02a 100644 --- a/shell/e-corba-shortcuts.c +++ b/shell/e-corba-shortcuts.c @@ -87,7 +87,7 @@ shortcut_list_to_corba (const GSList *shortcut_list, /* GObject methods. */ static void -impl_finalize (GObject *object) +impl_dispose (GObject *object) { ECorbaShortcuts *corba_shortcuts; ECorbaShortcutsPrivate *priv; @@ -95,9 +95,22 @@ impl_finalize (GObject *object) corba_shortcuts = E_CORBA_SHORTCUTS (object); priv = corba_shortcuts->priv; - g_object_unref (priv->shortcuts); + if (priv->shortcuts != NULL) { + g_object_unref (priv->shortcuts); + priv->shortcuts = NULL; + } + + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + ECorbaShortcuts *corba_shortcuts; + + corba_shortcuts = E_CORBA_SHORTCUTS (object); - g_free (priv); + g_free (corba_shortcuts->priv); (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -286,6 +299,7 @@ class_init (GObjectClass *object_class) parent_class = gtk_type_class (PARENT_TYPE); + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; corba_shortcuts_class = E_CORBA_SHORTCUTS_CLASS (object_class); |