From ecf3434da05b1f39f793c24b38bfd278e10b5786 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 24 Aug 2010 11:21:41 -0400
Subject: 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.
---
 widgets/misc/e-selectable.c | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

(limited to 'widgets/misc/e-selectable.c')

diff --git a/widgets/misc/e-selectable.c b/widgets/misc/e-selectable.c
index da998d320d..433cd21438 100644
--- a/widgets/misc/e-selectable.c
+++ b/widgets/misc/e-selectable.c
@@ -21,8 +21,13 @@
 
 #include "e-selectable.h"
 
+G_DEFINE_INTERFACE (
+	ESelectable,
+	e_selectable,
+	GTK_TYPE_WIDGET)
+
 static void
-selectable_class_init (ESelectableInterface *interface)
+e_selectable_default_init (ESelectableInterface *interface)
 {
 	g_object_interface_install_property (
 		interface,
@@ -43,34 +48,6 @@ selectable_class_init (ESelectableInterface *interface)
 			G_PARAM_READABLE));
 }
 
-GType
-e_selectable_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		static const GTypeInfo type_info = {
-			sizeof (ESelectableInterface),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) selectable_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			0,     /* instance_size */
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) NULL,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			G_TYPE_INTERFACE, "ESelectable", &type_info, 0);
-
-		g_type_interface_add_prerequisite (type, GTK_TYPE_WIDGET);
-	}
-
-	return type;
-}
-
 void
 e_selectable_update_actions (ESelectable *selectable,
                              EFocusTracker *focus_tracker,
-- 
cgit v1.2.3