aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-attachment-handler.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-08-24 23:21:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-08-25 02:37:02 +0800
commitecf3434da05b1f39f793c24b38bfd278e10b5786 (patch)
tree485ed2399920ecb10dbee2b4db4c437c22574a20 /widgets/misc/e-attachment-handler.c
parentf1d2541c487fbf7433a1b9aad8e8982ef08b85f5 (diff)
downloadgsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.gz
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.zst
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.zip
GObject boilerplate cleanup.
Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over manual GType registration. This is just a start... lots more to do.
Diffstat (limited to 'widgets/misc/e-attachment-handler.c')
-rw-r--r--widgets/misc/e-attachment-handler.c39
1 files changed, 7 insertions, 32 deletions
diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c
index 303fc33cc2..947ae666d9 100644
--- a/widgets/misc/e-attachment-handler.c
+++ b/widgets/misc/e-attachment-handler.c
@@ -34,7 +34,10 @@ enum {
PROP_VIEW
};
-static gpointer parent_class;
+G_DEFINE_TYPE (
+ EAttachmentHandler,
+ e_attachment_handler,
+ G_TYPE_OBJECT)
static void
attachment_handler_set_view (EAttachmentHandler *handler,
@@ -104,15 +107,14 @@ attachment_handler_dispose (GObject *object)
}
/* Chain up to parent's dispose() method. */
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (e_attachment_handler_parent_class)->dispose (object);
}
static void
-attachment_handler_class_init (EAttachmentHandlerClass *class)
+e_attachment_handler_class_init (EAttachmentHandlerClass *class)
{
GObjectClass *object_class;
- parent_class = g_type_class_peek_parent (class);
g_type_class_add_private (class, sizeof (EAttachmentHandlerPrivate));
object_class = G_OBJECT_CLASS (class);
@@ -134,38 +136,11 @@ attachment_handler_class_init (EAttachmentHandlerClass *class)
}
static void
-attachment_handler_init (EAttachmentHandler *handler)
+e_attachment_handler_init (EAttachmentHandler *handler)
{
handler->priv = E_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
}
-GType
-e_attachment_handler_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0)) {
- static const GTypeInfo type_info = {
- sizeof (EAttachmentHandlerClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) attachment_handler_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class_data */
- sizeof (EAttachmentHandler),
- 0, /* n_preallocs */
- (GInstanceInitFunc) attachment_handler_init,
- NULL /* value_table */
- };
-
- type = g_type_register_static (
- G_TYPE_OBJECT, "EAttachmentHandler",
- &type_info, G_TYPE_FLAG_ABSTRACT);
- }
-
- return type;
-}
-
EAttachmentView *
e_attachment_handler_get_view (EAttachmentHandler *handler)
{