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, 26 insertions, 9 deletions

diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index c76a12cbd1..2561ce91bb 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -619,10 +619,10 @@ storage_set_updated_folder_callback (EStorageSet *storage_set,
 }
 
 
-/* GtkObject methods.  */
+/* GObject methods.  */
 
 static void
-impl_destroy (GtkObject *object)
+impl_dispose (GObject *object)
 {
 	EShortcuts *shortcuts;
 	EShortcutsPrivate *priv;
@@ -630,29 +630,46 @@ impl_destroy (GtkObject *object)
 	shortcuts = E_SHORTCUTS (object);
 	priv = shortcuts->priv;
 
-	g_free (priv->file_name);
-
 	unload_shortcuts (shortcuts);
 
-	if (priv->save_idle_id != 0)
+	if (priv->save_idle_id != 0) {
 		gtk_idle_remove (priv->save_idle_id);
+		priv->save_idle_id = 0;
+	}
 
 	if (priv->dirty) {
 		if (! e_shortcuts_save (shortcuts, NULL))
 			g_warning (_("Error saving shortcuts.")); /* FIXME */
+		priv->dirty = FALSE;
 	}
 
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+}
+
+static void
+impl_finalize (GObject *object)
+{
+	EShortcuts *shortcuts;
+	EShortcutsPrivate *priv;
+
+	shortcuts = E_SHORTCUTS (object);
+	priv = shortcuts->priv;
+
+	g_free (priv->file_name);
+	g_free (priv);
+
+	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 
 static void
 class_init (EShortcutsClass *klass)
 {
-	GtkObjectClass *object_class;
+	GObjectClass *object_class;
 
-	object_class = (GtkObjectClass*) klass;
-	object_class->destroy = impl_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 ());