From 05b60f793cc6d7dff47b5980487f7ee1248d8f08 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 14 Oct 2004 14:44:41 +0000 Subject: convert to G_DEFINE_TYPE 2004-10-14 JP Rosevear * gui/e-day-view.c: convert to G_DEFINE_TYPE * gui/e-day-view-config.c: ditto * gui/e-day-view-main-item.c: ditto * gui/e-day-view-time-item.c: ditto * gui/e-day-view-top-item.c: ditto svn path=/trunk/; revision=27577 --- calendar/gui/e-day-view-config.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'calendar/gui/e-day-view-config.c') diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index 4b53f1a350..d2843ed042 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -30,14 +30,14 @@ struct _EDayViewConfigPrivate { GList *notifications; }; -static GObjectClass *parent_class = NULL; - /* Property IDs */ enum props { PROP_0, PROP_VIEW, }; +G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT); + static void e_day_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { @@ -86,8 +86,8 @@ e_day_view_config_dispose (GObject *object) e_day_view_config_set_view (view_config, NULL); - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (object); + if (G_OBJECT_CLASS (e_day_view_config_parent_class)->dispose) + G_OBJECT_CLASS (e_day_view_config_parent_class)->dispose (object); } static void @@ -100,8 +100,8 @@ e_day_view_config_finalize (GObject *object) g_free (priv); - if (G_OBJECT_CLASS (parent_class)->finalize) - G_OBJECT_CLASS (parent_class)->finalize (object); + if (G_OBJECT_CLASS (e_day_view_config_parent_class)->finalize) + G_OBJECT_CLASS (e_day_view_config_parent_class)->finalize (object); } static void @@ -110,8 +110,6 @@ e_day_view_config_class_init (EDayViewConfigClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GParamSpec *spec; - parent_class = g_type_class_peek_parent (klass); - /* Method override */ gobject_class->set_property = e_day_view_config_set_property; gobject_class->get_property = e_day_view_config_get_property; @@ -124,15 +122,12 @@ e_day_view_config_class_init (EDayViewConfigClass *klass) } static void -e_day_view_config_init (EDayViewConfig *view_config, EDayViewConfigClass *klass) +e_day_view_config_init (EDayViewConfig *view_config) { view_config->priv = g_new0 (EDayViewConfigPrivate, 1); } -E_MAKE_TYPE (e_day_view_config, "EDayViewConfig", EDayViewConfig, e_day_view_config_class_init, - e_day_view_config_init, G_TYPE_OBJECT); - EDayViewConfig * e_day_view_config_new (EDayView *day_view) { -- cgit