Convert to G_DEFINE_TYPE

2004-12-21  JP Rosevear  <jpr@novell.com>

	* e-corba-config-page.c: Convert to G_DEFINE_TYPE

	* e-history.c: ditto

	* e-shell-folder-title-bar.c: ditto

	* e-shell-offline-handler.c: ditto

	* e-shell-settings-dialog.c: ditto

	* e-shell-window.c: ditto

	* e-sidebar.c: ditto

	* e-user-creatable-items-handler.c: ditto

	* e-component-registry.c: ditto

	* importer/evolution-importer-client.c: ditto

svn path=/trunk/; revision=28164

1 files changed, 6 insertions, 17 deletions

diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 42063ccea4..0b96b2cf63 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -30,8 +30,6 @@
 #include "e-corba-config-page.h"
 #include <e-util/e-icon-factory.h>
 
-#include <gal/util/e-util.h>
-
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-exception.h>
 
@@ -39,16 +37,12 @@
 
 #include <string.h>
 
-
-#define PARENT_TYPE e_multi_config_dialog_get_type ()
-static EMultiConfigDialogClass *parent_class = NULL;
-
-
-
 struct _EShellSettingsDialogPrivate {
 	GHashTable *types;
 };
 
+G_DEFINE_TYPE (EShellSettingsDialog, e_shell_settings_dialog, E_TYPE_MULTI_CONFIG_DIALOG)
+
 
 /* FIXME ugly hack to work around that sizing of invisible widgets is broken
    with Bonobo.  */
@@ -295,23 +289,21 @@ impl_finalize (GObject *object)
 
 	g_free (priv);
 	
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	(* G_OBJECT_CLASS (e_shell_settings_dialog_parent_class)->finalize) (object);
 }
 
 
 static void
-class_init (EShellSettingsDialog *class)
+e_shell_settings_dialog_class_init (EShellSettingsDialogClass *klass)
 {
 	GObjectClass *object_class;
 
-	object_class = G_OBJECT_CLASS (class);
+	object_class = G_OBJECT_CLASS (klass);
 	object_class->finalize = impl_finalize;
-
-	parent_class = g_type_class_ref(PARENT_TYPE);
 }
 
 static void
-init (EShellSettingsDialog *dialog)
+e_shell_settings_dialog_init (EShellSettingsDialog *dialog)
 {
 	EShellSettingsDialogPrivate *priv;
 
@@ -367,7 +359,4 @@ e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const char *typ
 	e_multi_config_dialog_show_page (E_MULTI_CONFIG_DIALOG (dialog), page);
 }
 
-
-E_MAKE_TYPE (e_shell_settings_dialog, "EShellSettingsDialog", EShellSettingsDialog,
-	     class_init, init, PARENT_TYPE)