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

1 files changed, 24 insertions, 9 deletions

diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 204546803e..448103c880 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -293,7 +293,7 @@ register_component (EComponentRegistry *component_registry,
 }
 
 
-/* GtkObject methods.  */
+/* GObject methods.  */
 
 static void
 component_id_foreach_free (void *key,
@@ -307,7 +307,7 @@ component_id_foreach_free (void *key,
 }
 
 static void
-destroy (GtkObject *object)
+impl_dispose (GObject *object)
 {
 	EComponentRegistry *component_registry;
 	EComponentRegistryPrivate *priv;
@@ -315,23 +315,38 @@ destroy (GtkObject *object)
 	component_registry = E_COMPONENT_REGISTRY (object);
 	priv = component_registry->priv;
 
-	g_hash_table_foreach (priv->component_id_to_component, component_id_foreach_free, NULL);
-	g_hash_table_destroy (priv->component_id_to_component);
+	if (priv->component_id_to_component != NULL) {
+		g_hash_table_foreach (priv->component_id_to_component, component_id_foreach_free, NULL);
+		g_hash_table_destroy (priv->component_id_to_component);
+		priv->component_id_to_component = NULL;
+	}
+
+	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+}
+
+static void
+impl_finalize (GObject *object)
+{
+	EComponentRegistry *component_registry;
+	EComponentRegistryPrivate *priv;
+
+	component_registry = E_COMPONENT_REGISTRY (object);
+	priv = component_registry->priv;
 
 	g_free (priv);
 
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 
 static void
 class_init (EComponentRegistryClass *klass)
 {
-	GtkObjectClass *object_class;
+	GObjectClass *object_class;
 
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
+	object_class = G_OBJECT_CLASS (klass);
+	object_class->dispose  = impl_dispose;
+	object_class->finalize = impl_finalize;
 
 	parent_class = gtk_type_class (gtk_object_get_type ());
 }