From 2dd7b84edba6021442f9fe1c1fa5b8c3bb39fc26 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 21 Feb 2003 21:41:02 +0000 Subject: GObject, not GtkObject. (calendar_model_destroy): -> 2003-02-21 Hans Petter Jansson * gui/calendar-model.c (calendar_model_class_init): GObject, not GtkObject. (calendar_model_destroy): -> calendar_model_finalize (). * gui/calendar-view.c (calendar_view_class_init): GObject, not GtkObject. (calendar_view_destroy): -> calendar_view_finalize (). * gui/comp-editor-factory.c (comp_editor_factory_class_init): GObject, not GtkObject. (comp_editor_factory_destroy): -> comp_editor_factory_finalize (). * gui/e-day-view.c (e_day_view_long_event_button_press): gtk_signal_disconnect () -> g_signal_handler_disconnect (). (e_day_view_on_event_button_press): Ditto. (e_day_view_on_long_event_click): Ditto. (e_day_view_on_event_click): Ditto. (e_day_view_on_event_double_click): Ditto. (e_day_view_on_delete_appointment): Ditto. * gui/e-week-view.c (e_week_view_on_text_item_event): gtk_signal_disconnect () -> g_signal_handler_disconnect (). * gui/alarm-notify/alarm-notify.c (AlarmNotify_RemoveCalendar): Don't cast to GtkObject. svn path=/trunk/; revision=19995 --- calendar/gui/calendar-model.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'calendar/gui/calendar-model.c') diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index 1cd62dd371..ce981fb144 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -113,7 +113,7 @@ struct _CalendarModelPrivate { static void calendar_model_class_init (CalendarModelClass *class); static void calendar_model_init (CalendarModel *model); -static void calendar_model_destroy (GtkObject *object); +static void calendar_model_finalize (GObject *object); static int calendar_model_column_count (ETableModel *etm); static int calendar_model_row_count (ETableModel *etm); @@ -152,15 +152,15 @@ E_MAKE_TYPE (calendar_model, "CalendarModel", CalendarModel, calendar_model_clas static void calendar_model_class_init (CalendarModelClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; ETableModelClass *etm_class; - object_class = (GtkObjectClass *) class; + object_class = (GObjectClass *) class; etm_class = (ETableModelClass *) class; parent_class = g_type_class_peek_parent (class); - object_class->destroy = calendar_model_destroy; + object_class->finalize = calendar_model_finalize; etm_class->column_count = calendar_model_column_count; etm_class->row_count = calendar_model_row_count; @@ -289,7 +289,7 @@ free_objects (CalendarModel *model) /* Destroy handler for the calendar table model */ static void -calendar_model_destroy (GtkObject *object) +calendar_model_finalize (GObject *object) { CalendarModel *model; CalendarModelPrivate *priv; @@ -352,8 +352,8 @@ calendar_model_destroy (GtkObject *object) g_free (priv); model->priv = NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (parent_class)->finalize) + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } -- cgit v1.2.3