aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-storage-set.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-12 01:08:13 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-12 01:08:13 +0800
commitc55ddc508dd4c9b558777f99604050f60b6158d3 (patch)
tree0c77bf97c02b135f557dca8747e3bebc3d7b32b6 /shell/e-storage-set.c
parent8657f5bbf2ddd4a5118767643e0d3cc97d60f145 (diff)
downloadgsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.gz
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/e-storage-set.c')
-rw-r--r--shell/e-storage-set.c36
1 files changed, 27 insertions, 9 deletions
diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c
index 163f98758d..3cc17d1bdb 100644
--- a/shell/e-storage-set.c
+++ b/shell/e-storage-set.c
@@ -336,7 +336,7 @@ signal_new_folder_for_all_folders_in_storage (EStorageSet *storage_set,
/* GtkObject methods. */
static void
-destroy (GtkObject *object)
+impl_dispose (GObject *object)
{
EStorageSet *storage_set;
EStorageSetPrivate *priv;
@@ -344,29 +344,47 @@ destroy (GtkObject *object)
storage_set = E_STORAGE_SET (object);
priv = storage_set->priv;
- e_free_object_list (priv->storages);
+ if (priv->storages != NULL) {
+ e_free_object_list (priv->storages);
+ priv->storages = NULL;
+ }
+
+ if (priv->folder_type_registry != NULL) {
+ g_object_unref (priv->folder_type_registry);
+ priv->folder_type_registry = NULL;
+ }
+
+ (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+}
+
+static void
+impl_finalize (GObject *object)
+{
+ EStorageSet *storage_set;
+ EStorageSetPrivate *priv;
- g_object_unref (priv->folder_type_registry);
+ storage_set = E_STORAGE_SET (object);
+ priv = storage_set->priv;
- g_hash_table_foreach (priv->name_to_named_storage,
- (GHFunc) name_to_named_storage_foreach_destroy, NULL);
+ g_hash_table_foreach (priv->name_to_named_storage, (GHFunc) name_to_named_storage_foreach_destroy, NULL);
g_hash_table_destroy (priv->name_to_named_storage);
g_free (priv);
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
class_init (EStorageSetClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
parent_class = gtk_type_class (gtk_object_get_type ());
- object_class = GTK_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- object_class->destroy = destroy;
+ object_class->dispose = impl_dispose;
+ object_class->finalize = impl_finalize;
signals[NEW_STORAGE] =
gtk_signal_new ("new_storage",