1 files changed, 153 insertions, 129 deletions

diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c
index f8a7af9c14..6e43886dbd 100644
--- a/calendar/gui/e-calendar-table-config.c
+++ b/calendar/gui/e-calendar-table-config.c
@@ -24,221 +24,245 @@
 #include "e-cell-date-edit-config.h"
 #include "e-calendar-table-config.h"
 
+#define E_CALENDAR_TABLE_CONFIG_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_CALENDAR_TABLE_CONFIG, ECalendarTableConfigPrivate))
+
 struct _ECalendarTableConfigPrivate {
 	ECalendarTable *table;
-
 	ECellDateEditConfig *cell_config;
-
 	GList *notifications;
 };
 
-/* Property IDs */
-enum props {
+enum {
 	PROP_0,
 	PROP_TABLE
 };
 
-G_DEFINE_TYPE (ECalendarTableConfig, e_calendar_table_config, G_TYPE_OBJECT)
+static gpointer parent_class;
 
 static void
-e_calendar_table_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+calendar_table_config_set_timezone (ECalendarTable *table)
 {
-	ECalendarTableConfig *table_config;
-
-	table_config = E_CALENDAR_TABLE_CONFIG (object);
+	ECalModel *model;
+	icaltimezone *zone;
 
-	switch (property_id) {
-	case PROP_TABLE:
-		e_calendar_table_config_set_table (table_config, g_value_get_object (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
+	zone = calendar_config_get_icaltimezone ();
+	model = e_calendar_table_get_model (table);
+	if (model != NULL)
+		e_cal_model_set_timezone (model, zone);
 }
 
 static void
-e_calendar_table_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+calendar_table_config_timezone_changed_cb (GConfClient *client,
+                                           guint id,
+                                           GConfEntry *entry,
+                                           gpointer data)
 {
-	ECalendarTableConfig *table_config;
-
-	table_config = E_CALENDAR_TABLE_CONFIG (object);
+	ECalendarTableConfig *table_config = data;
 
-	switch (property_id) {
-	case PROP_TABLE:
-		g_value_set_object (value, e_calendar_table_config_get_table (table_config));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
+	calendar_table_config_set_timezone (table_config->priv->table);
 }
 
 static void
-e_calendar_table_config_dispose (GObject *object)
+calendar_table_config_set_twentyfour_hour (ECalendarTable *table)
 {
-	ECalendarTableConfig *table_config = E_CALENDAR_TABLE_CONFIG (object);
+	ECalModel *model;
+	gboolean use_24_hour;
 
-	e_calendar_table_config_set_table (table_config, NULL);
+	use_24_hour = calendar_config_get_24_hour_format ();
 
-	if (G_OBJECT_CLASS (e_calendar_table_config_parent_class)->dispose)
-		G_OBJECT_CLASS (e_calendar_table_config_parent_class)->dispose (object);
+	model = e_calendar_table_get_model (table);
+	if (model != NULL)
+		e_cal_model_set_use_24_hour_format (model, use_24_hour);
 }
 
 static void
-e_calendar_table_config_finalize (GObject *object)
+calendar_table_config_twentyfour_hour_changed_cb (GConfClient *client,
+                                                  guint id,
+                                                  GConfEntry *entry,
+                                                  gpointer data)
 {
-	ECalendarTableConfig *table_config = E_CALENDAR_TABLE_CONFIG (object);
-	ECalendarTableConfigPrivate *priv;
-
-	priv = table_config->priv;
-
-	g_free (priv);
+	ECalendarTableConfig *table_config = data;
 
-	if (G_OBJECT_CLASS (e_calendar_table_config_parent_class)->finalize)
-		G_OBJECT_CLASS (e_calendar_table_config_parent_class)->finalize (object);
+	calendar_table_config_set_twentyfour_hour (table_config->priv->table);
 }
 
 static void
-e_calendar_table_config_class_init (ECalendarTableConfigClass *klass)
+calendar_table_config_set_property (GObject *object,
+                                    guint property_id,
+                                    const GValue *value,
+                                    GParamSpec *pspec)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GParamSpec *spec;
-
-	/* Method override */
-	gobject_class->set_property = e_calendar_table_config_set_property;
-	gobject_class->get_property = e_calendar_table_config_get_property;
-	gobject_class->dispose = e_calendar_table_config_dispose;
-	gobject_class->finalize = e_calendar_table_config_finalize;
-
-	spec = g_param_spec_object ("table", NULL, NULL, e_calendar_table_get_type (),
-				    G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT);
-	g_object_class_install_property (gobject_class, PROP_TABLE, spec);
+	switch (property_id) {
+		case PROP_TABLE:
+			e_calendar_table_config_set_table (
+				E_CALENDAR_TABLE_CONFIG (object),
+				g_value_get_object (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
 static void
-e_calendar_table_config_init (ECalendarTableConfig *table_config)
+calendar_table_config_get_property (GObject *object,
+                                    guint property_id,
+                                    GValue *value,
+                                    GParamSpec *pspec)
 {
-	table_config->priv = g_new0 (ECalendarTableConfigPrivate, 1);
+	switch (property_id) {
+		case PROP_TABLE:
+			g_value_set_object (
+				value, e_calendar_table_config_get_table (
+				E_CALENDAR_TABLE_CONFIG (object)));
+			return;
+	}
 
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-ECalendarTableConfig *
-e_calendar_table_config_new (ECalendarTable *table)
+static void
+calendar_table_config_dispose (GObject *object)
 {
-	ECalendarTableConfig *table_config;
+	ECalendarTableConfig *table_config = E_CALENDAR_TABLE_CONFIG (object);
 
-	table_config = g_object_new (e_calendar_table_config_get_type (), "table", table, NULL);
+	e_calendar_table_config_set_table (table_config, NULL);
 
-	return table_config;
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-ECalendarTable *
-e_calendar_table_config_get_table (ECalendarTableConfig *table_config)
+static void
+calendar_table_config_class_init (ECalendarTableConfigClass *class)
 {
-	ECalendarTableConfigPrivate *priv;
-
-	g_return_val_if_fail (table_config != NULL, NULL);
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE_CONFIG (table_config), NULL);
-
-	priv = table_config->priv;
-
-	return priv->table;
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (ECalendarTableConfigPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = calendar_table_config_set_property;
+	object_class->get_property = calendar_table_config_get_property;
+	object_class->dispose = calendar_table_config_dispose;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_TABLE,
+		g_param_spec_object (
+			"table",
+			NULL,
+			NULL,
+			E_TYPE_CALENDAR_TABLE,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
 }
 
 static void
-set_timezone (ECalendarTable *table)
+calendar_table_config_init (ECalendarTableConfig *table_config)
 {
-	ECalModel *model;
-	icaltimezone *zone;
-
-	zone = calendar_config_get_icaltimezone ();
-	model = e_calendar_table_get_model (table);
-	if (model)
-		e_cal_model_set_timezone (model, zone);
+	table_config->priv =
+		E_CALENDAR_TABLE_CONFIG_GET_PRIVATE (table_config);
 }
 
-static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+GType
+e_calendar_table_config_get_type (void)
 {
-	ECalendarTableConfig *table_config = data;
-	ECalendarTableConfigPrivate *priv;
-
-	priv = table_config->priv;
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (ECalendarTableConfigClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) calendar_table_config_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (ECalendarTableConfig),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) calendar_table_config_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			G_TYPE_OBJECT, "ECalendarTableConfig", &type_info, 0);
+	}
 
-	set_timezone (priv->table);
+	return type;
 }
 
-static void
-set_twentyfour_hour (ECalendarTable *table)
+ECalendarTableConfig *
+e_calendar_table_config_new (ECalendarTable *table)
 {
-	ECalModel *model;
-	gboolean use_24_hour;
+	g_return_val_if_fail (E_IS_CALENDAR_TABLE (table), NULL);
 
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	model = e_calendar_table_get_model (table);
-	if (model)
-		e_cal_model_set_use_24_hour_format (model, use_24_hour);
+	return g_object_new (
+		E_TYPE_CALENDAR_TABLE_CONFIG,
+		"table", table, NULL);
 }
 
-static void
-twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+ECalendarTable *
+e_calendar_table_config_get_table (ECalendarTableConfig *table_config)
 {
-	ECalendarTableConfig *table_config = data;
-	ECalendarTableConfigPrivate *priv;
-
-	priv = table_config->priv;
+	g_return_val_if_fail (E_IS_CALENDAR_TABLE_CONFIG (table_config), NULL);
 
-	set_twentyfour_hour (priv->table);
+	return table_config->priv->table;
 }
 
 void
-e_calendar_table_config_set_table (ECalendarTableConfig *table_config, ECalendarTable *table)
+e_calendar_table_config_set_table (ECalendarTableConfig *table_config,
+                                   ECalendarTable *table)
 {
 	ECalendarTableConfigPrivate *priv;
-	guint not;
-	GList *l;
+	guint notification;
+	GList *list, *iter;
 
-	g_return_if_fail (table_config != NULL);
 	g_return_if_fail (E_IS_CALENDAR_TABLE_CONFIG (table_config));
 
 	priv = table_config->priv;
 
-	if (priv->table) {
-		g_object_unref (priv->table);
-		priv->table = NULL;
+	if (table_config->priv->table) {
+		g_object_unref (table_config->priv->table);
+		table_config->priv->table = NULL;
 	}
 
-	if (priv->cell_config) {
-		g_object_unref (priv->cell_config);
-		priv->cell_config = NULL;
+	if (table_config->priv->cell_config) {
+		g_object_unref (table_config->priv->cell_config);
+		table_config->priv->cell_config = NULL;
 	}
 
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
+	list = table_config->priv->notifications;
+	for (iter = list; iter != NULL; iter = iter->next) {
+		notification = GPOINTER_TO_UINT (iter->data);
+		calendar_config_remove_notification (notification);
+	}
+	g_list_free (list);
+	table_config->priv->notifications = NULL;
 
-	/* If the new view is NULL, return right now */
-	if (!table)
+	if (table == NULL)
 		return;
 
-	priv->table = g_object_ref (table);
+	table_config->priv->table = g_object_ref (table);
 
 	/* Time zone */
-	set_timezone (table);
+	calendar_table_config_set_timezone (table);
 
-	not = calendar_config_add_notification_timezone (timezone_changed_cb, table_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
+	notification = calendar_config_add_notification_timezone (
+		calendar_table_config_timezone_changed_cb, table_config);
+	table_config->priv->notifications = g_list_prepend (
+		table_config->priv->notifications,
+		GUINT_TO_POINTER (notification));
 
 	/* 24 Hour format */
-	set_twentyfour_hour (table);
+	calendar_table_config_set_twentyfour_hour (table);
 
-	not = calendar_config_add_notification_24_hour_format (twentyfour_hour_changed_cb, table_config);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
+	notification = calendar_config_add_notification_24_hour_format (
+		calendar_table_config_twentyfour_hour_changed_cb, table_config);
+	table_config->priv->notifications = g_list_prepend (
+		table_config->priv->notifications,
+		GUINT_TO_POINTER (notification));
 
 	/* Date cell */
-	priv->cell_config = e_cell_date_edit_config_new (table->dates_cell);
+	table_config->priv->cell_config =
+		e_cell_date_edit_config_new (table->dates_cell);
 }