From a0da580e7e2355b6f6e084cbd968dd6176156082 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 21 Dec 2004 15:42:46 +0000 Subject: Convert to G_DEFINE_TYPE 2004-12-21 JP Rosevear * 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 --- shell/e-corba-config-page.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'shell/e-corba-config-page.c') diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index 9e26785dac..64e79782e7 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -29,21 +29,19 @@ #include "Evolution.h" #include -#include #include #include #include #include - -#define PARENT_TYPE e_config_page_get_type () -static EConfigPageClass *parent_class = NULL; struct _ECorbaConfigPagePrivate { GNOME_Evolution_ConfigControl config_control_interface; }; +G_DEFINE_TYPE (ECorbaConfigPage, e_corba_config_page, E_TYPE_CONFIG_PAGE) + /* GObject methods. */ static void @@ -65,7 +63,7 @@ impl_dispose (GObject *object) CORBA_exception_free (&ev); - (* G_OBJECT_CLASS (parent_class)->dispose) (object); + (* G_OBJECT_CLASS (e_corba_config_page_parent_class)->dispose) (object); } static void @@ -79,13 +77,13 @@ impl_finalize (GObject *object) g_free (priv); - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (e_corba_config_page_parent_class)->finalize) (object); } /* GTK+ ctors. */ static void -class_init (ECorbaConfigPageClass *class) +e_corba_config_page_class_init (ECorbaConfigPageClass *class) { GObjectClass *object_class; EConfigPageClass *config_page_class; @@ -95,12 +93,10 @@ class_init (ECorbaConfigPageClass *class) object_class->finalize = impl_finalize; config_page_class = E_CONFIG_PAGE_CLASS (class); - - parent_class = g_type_class_ref(PARENT_TYPE); } static void -init (ECorbaConfigPage *corba_config_page) +e_corba_config_page_init (ECorbaConfigPage *corba_config_page) { ECorbaConfigPagePrivate *priv; @@ -160,6 +156,3 @@ e_corba_config_page_new_from_objref (GNOME_Evolution_ConfigControl corba_object) return GTK_WIDGET (corba_config_page); } - - -E_MAKE_TYPE (e_corba_config_page, "ECorbaConfigPgae", ECorbaConfigPage, class_init, init, PARENT_TYPE) -- cgit v1.2.3