From e99e12428d46db3be2878f6c2ca63bd7510149f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 May 2008 17:27:48 +0000 Subject: ** Fixes bug #534360 2008-05-22 Matthew Barnes ** Fixes bug #534360 Migrate from deprecated GtkObject symbols to GObject equivalents. Touches over 150 files in all components; too many to list. svn path=/trunk/; revision=35526 --- calendar/gui/e-day-view-time-item.c | 61 +++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 26 deletions(-) (limited to 'calendar/gui/e-day-view-time-item.c') diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index bbd9471e1a..6be8e34aaf 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -63,9 +63,10 @@ #define E_DVTMI_LARGE_HOUR_Y_PAD 1 #define E_DVTMI_SMALL_FONT_Y_PAD 1 -static void e_day_view_time_item_set_arg (GtkObject *o, - GtkArg *arg, - guint arg_id); +static void e_day_view_time_item_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); static void e_day_view_time_item_update (GnomeCanvasItem *item, double *affine, @@ -99,8 +100,8 @@ static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtm /* The arguments we take */ enum { - ARG_0, - ARG_DAY_VIEW + PROP_0, + PROP_DAY_VIEW }; G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM) @@ -108,23 +109,26 @@ G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM) static void e_day_view_time_item_class_init (EDayViewTimeItemClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GnomeCanvasItemClass *item_class; - object_class = (GtkObjectClass *) class; - item_class = (GnomeCanvasItemClass *) class; - - gtk_object_add_arg_type ("EDayViewTimeItem::day_view", - GTK_TYPE_POINTER, GTK_ARG_WRITABLE, - ARG_DAY_VIEW); - - object_class->set_arg = e_day_view_time_item_set_arg; - - /* GnomeCanvasItem method overrides */ - item_class->update = e_day_view_time_item_update; - item_class->draw = e_day_view_time_item_draw; - item_class->point = e_day_view_time_item_point; - item_class->event = e_day_view_time_item_event; + object_class = G_OBJECT_CLASS (class); + object_class->set_property = e_day_view_time_item_set_property; + + item_class = GNOME_CANVAS_ITEM_CLASS (class); + item_class->update = e_day_view_time_item_update; + item_class->draw = e_day_view_time_item_draw; + item_class->point = e_day_view_time_item_point; + item_class->event = e_day_view_time_item_event; + + g_object_class_install_property ( + object_class, + PROP_DAY_VIEW, + g_param_spec_pointer ( + "day_view", + NULL, + NULL, + G_PARAM_WRITABLE)); } @@ -136,17 +140,22 @@ e_day_view_time_item_init (EDayViewTimeItem *dvtmitem) static void -e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) +e_day_view_time_item_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { EDayViewTimeItem *dvtmitem; - dvtmitem = E_DAY_VIEW_TIME_ITEM (o); + dvtmitem = E_DAY_VIEW_TIME_ITEM (object); - switch (arg_id){ - case ARG_DAY_VIEW: - dvtmitem->day_view = GTK_VALUE_POINTER (*arg); - break; + switch (property_id) { + case PROP_DAY_VIEW: + dvtmitem->day_view = g_value_get_pointer (value); + return; } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } -- cgit