aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-user-creatable-items-handler.c
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-12-21 23:42:46 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-12-21 23:42:46 +0800
commita0da580e7e2355b6f6e084cbd968dd6176156082 (patch)
treed902eddfe5429b7d8dc2e0fa1055f136f880561f /shell/e-user-creatable-items-handler.c
parent8cb1b7cf11da0d32a087f3f580fb76f0eb2aa212 (diff)
downloadgsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.tar
gsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.tar.gz
gsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.tar.bz2
gsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.tar.lz
gsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.tar.xz
gsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.tar.zst
gsoc2013-evolution-a0da580e7e2355b6f6e084cbd968dd6176156082.zip
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
Diffstat (limited to 'shell/e-user-creatable-items-handler.c')
-rw-r--r--shell/e-user-creatable-items-handler.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index e635278c68..a631304435 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -32,8 +32,6 @@
#include "e-util/e-corba-utils.h"
#include "widgets/misc/e-combo-button.h"
-#include <gal/util/e-util.h>
-
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-control.h>
@@ -52,11 +50,6 @@
#include <ctype.h>
#include <string.h>
-
-#define PARENT_TYPE G_TYPE_OBJECT
-static GObjectClass *parent_class = NULL;
-
-
struct _Component {
char *id, *alias;
GNOME_Evolution_Component component;
@@ -109,6 +102,7 @@ enum {
LAST_PROP
};
+G_DEFINE_TYPE (EUserCreatableItemsHandler, e_user_creatable_items_handler, G_TYPE_OBJECT)
/* Component struct handling. */
@@ -767,7 +761,7 @@ impl_dispose (GObject *object)
priv->accel_group = NULL;
}
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ (* G_OBJECT_CLASS (e_user_creatable_items_handler_parent_class)->dispose) (object);
}
static void
@@ -788,15 +782,16 @@ impl_finalize (GObject *object)
g_free (priv);
- (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+ (* G_OBJECT_CLASS (e_user_creatable_items_handler_parent_class)->finalize) (object);
}
static void
-class_init (GObjectClass *object_class)
+e_user_creatable_items_handler_class_init (EUserCreatableItemsHandlerClass *klass)
{
- parent_class = g_type_class_ref(PARENT_TYPE);
-
+ GObjectClass *object_class;
+
+ object_class = G_OBJECT_CLASS (klass);
object_class->dispose = impl_dispose;
object_class->finalize = impl_finalize;
object_class->set_property = impl_set_property;
@@ -810,7 +805,7 @@ class_init (GObjectClass *object_class)
}
static void
-init (EUserCreatableItemsHandler *handler)
+e_user_creatable_items_handler_init (EUserCreatableItemsHandler *handler)
{
EUserCreatableItemsHandlerPrivate *priv;
@@ -869,4 +864,4 @@ e_user_creatable_items_handler_activate (EUserCreatableItemsHandler *handler,
NULL);
}
-E_MAKE_TYPE (e_user_creatable_items_handler, "EUserCreatableItemsHandler", EUserCreatableItemsHandler, class_init, init, PARENT_TYPE)
+