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-storage-registry.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-storage-registry.c')
| -rw-r--r-- | shell/e-corba-storage-registry.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c index b7f69ef6fd..07db240d70 100644 --- a/shell/e-corba-storage-registry.c +++ b/shell/e-corba-storage-registry.c @@ -390,7 +390,7 @@ impl_StorageRegistry_getFolderByUri (PortableServer_Servant servant, /* GObject methods. */ static void -impl_finalize (GObject *object) +impl_dispose (GObject *object) { ECorbaStorageRegistry *corba_storage_registry; ECorbaStorageRegistryPrivate *priv; @@ -398,8 +398,23 @@ impl_finalize (GObject *object) corba_storage_registry = E_CORBA_STORAGE_REGISTRY (object); priv = corba_storage_registry->priv; - if (priv->storage_set != NULL) + if (priv->storage_set != NULL) { g_object_unref (priv->storage_set); + priv->storage_set = NULL; + } + + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + ECorbaStorageRegistry *corba_storage_registry; + ECorbaStorageRegistryPrivate *priv; + + corba_storage_registry = E_CORBA_STORAGE_REGISTRY (object); + priv = corba_storage_registry->priv; + g_free (priv); (* G_OBJECT_CLASS (parent_class)->finalize) (object); @@ -415,6 +430,7 @@ class_init (ECorbaStorageRegistryClass *klass) POA_GNOME_Evolution_StorageRegistry__epv *epv; object_class = G_OBJECT_CLASS (klass); + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; epv = & klass->epv; |