ECalConfigModel: Use G_DEFINE_DYNAMIC_TYPE.

Follow the usual GObject conventions.

(cherry picked from commit 09438389c17a2b542d3c055e287f22fa3a1b6513)

3 files changed, 73 insertions, 27 deletions

diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index 8c9bcc0229..fea96c767a 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -22,13 +22,22 @@
 
 #include "e-cal-config-model.h"
 
-#include <libebackend/libebackend.h>
-
 #include <shell/e-shell.h>
 #include <calendar/gui/e-cal-model.h>
 #include <calendar/gui/e-cal-model-tasks.h>
 
-static gpointer parent_class;
+#define E_CAL_CONFIG_MODEL_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelPrivate))
+
+struct _ECalConfigModelPrivate {
+	gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	ECalConfigModel,
+	e_cal_config_model,
+	E_TYPE_EXTENSION)
 
 static void
 cal_config_model_constructed (GObject *object)
@@ -132,39 +141,41 @@ cal_config_model_constructed (GObject *object)
 	}
 
 	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (parent_class)->constructed (object);
+	G_OBJECT_CLASS (e_cal_config_model_parent_class)->constructed (object);
 }
 
 static void
-cal_config_model_class_init (EExtensionClass *class)
+e_cal_config_model_class_init (ECalConfigModelClass *class)
 {
 	GObjectClass *object_class;
+	EExtensionClass *extension_class;
 
-	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (ECalConfigModelPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = cal_config_model_constructed;
 
-	class->extensible_type = E_TYPE_CAL_MODEL;
+	extension_class = E_EXTENSION_CLASS (class);
+	extension_class->extensible_type = E_TYPE_CAL_MODEL;
+}
+
+static void
+e_cal_config_model_class_finalize (ECalConfigModelClass *class)
+{
+}
+
+static void
+e_cal_config_model_init (ECalConfigModel *extension)
+{
+	extension->priv = E_CAL_CONFIG_MODEL_GET_PRIVATE (extension);
 }
 
 void
-e_cal_config_model_register_type (GTypeModule *type_module)
+e_cal_config_model_type_register (GTypeModule *type_module)
 {
-	static const GTypeInfo type_info = {
-		sizeof (EExtensionClass),
-		(GBaseInitFunc) NULL,
-		(GBaseFinalizeFunc) NULL,
-		(GClassInitFunc) cal_config_model_class_init,
-		(GClassFinalizeFunc) NULL,
-		NULL,  /* class_data */
-		sizeof (EExtension),
-		0,     /* n_preallocs */
-		(GInstanceInitFunc) NULL,
-		NULL   /* value_table */
-	};
-
-	g_type_module_register_type (
-		type_module, E_TYPE_EXTENSION,
-		"ECalConfigModel", &type_info, 0);
+	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	 *     function, so we have to wrap it with a public function in
+	 *     order to register types from a separate compilation unit. */
+	e_cal_config_model_register_type (type_module);
 }
+
diff --git a/modules/calendar/e-cal-config-model.h b/modules/calendar/e-cal-config-model.h
index 1c1045a906..e5d0456e23 100644
--- a/modules/calendar/e-cal-config-model.h
+++ b/modules/calendar/e-cal-config-model.h
@@ -19,12 +19,47 @@
 #ifndef E_CAL_CONFIG_MODEL_H
 #define E_CAL_CONFIG_MODEL_H
 
-#include <glib-object.h>
+#include <libebackend/libebackend.h>
+
+/* Standard GObject macros */
+#define E_TYPE_CAL_CONFIG_MODEL \
+	(e_cal_config_model_get_type ())
+#define E_CAL_CONFIG_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModel))
+#define E_CAL_CONFIG_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelClass))
+#define E_IS_CAL_CONFIG_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_CONFIG_MODEL))
+#define E_IS_CAL_CONFIG_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_CONFIG_MODEL))
+#define E_CAL_CONFIG_MODEL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelClass))
 
 G_BEGIN_DECLS
 
-void e_cal_config_model_register_type (GTypeModule *type_module);
+typedef struct _ECalConfigModel ECalConfigModel;
+typedef struct _ECalConfigModelClass ECalConfigModelClass;
+typedef struct _ECalConfigModelPrivate ECalConfigModelPrivate;
+
+struct _ECalConfigModel {
+	EExtension parent;
+	ECalConfigModelPrivate *priv;
+};
+
+struct _ECalConfigModelClass {
+	EExtensionClass parent_class;
+};
+
+GType		e_cal_config_model_get_type	(void) G_GNUC_CONST;
+void		e_cal_config_model_type_register
+						(GTypeModule *type_module);
 
 G_END_DECLS
 
 #endif /* E_CAL_CONFIG_MODEL_H */
+
diff --git a/modules/calendar/evolution-module-calendar.c b/modules/calendar/evolution-module-calendar.c
index 1a8a7c2eca..50144ca59d 100644
--- a/modules/calendar/evolution-module-calendar.c
+++ b/modules/calendar/evolution-module-calendar.c
@@ -87,7 +87,7 @@ e_module_load (GTypeModule *type_module)
 	e_cal_config_date_edit_type_register (type_module);
 	e_cal_config_meeting_store_type_register (type_module);
 	e_cal_config_meeting_time_selector_type_register (type_module);
-	e_cal_config_model_register_type (type_module);
+	e_cal_config_model_type_register (type_module);
 	e_cal_config_view_register_type (type_module);
 
 	e_calendar_preferences_type_register (type_module);