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-view.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'calendar/gui/calendar-view.c') diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c index 894cca807e..1aec23ef36 100644 --- a/calendar/gui/calendar-view.c +++ b/calendar/gui/calendar-view.c @@ -39,7 +39,7 @@ struct _CalendarViewPrivate { static void calendar_view_class_init (CalendarViewClass *class); static void calendar_view_init (CalendarView *cview); -static void calendar_view_destroy (GtkObject *object); +static void calendar_view_finalize (GObject *object); static void calendar_view_edit (GalView *view, GtkWindow *parent_window); static void calendar_view_load (GalView *view, const char *filename); @@ -61,12 +61,12 @@ static void calendar_view_class_init (CalendarViewClass *class) { GalViewClass *gal_view_class; - GtkObjectClass *object_class; + GObjectClass *object_class; parent_class = g_type_class_peek_parent (class); gal_view_class = (GalViewClass *) class; - object_class = (GtkObjectClass *) class; + object_class = (GObjectClass *) class; gal_view_class->edit = calendar_view_edit; gal_view_class->load = calendar_view_load; @@ -76,7 +76,7 @@ calendar_view_class_init (CalendarViewClass *class) gal_view_class->get_type_code = calendar_view_get_type_code; gal_view_class->clone = calendar_view_clone; - object_class->destroy = calendar_view_destroy; + object_class->finalize = calendar_view_finalize; } /* Object initialization function for the calendar view */ @@ -93,7 +93,7 @@ calendar_view_init (CalendarView *cal_view) /* Destroy method for the calendar view */ static void -calendar_view_destroy (GtkObject *object) +calendar_view_finalize (GObject *object) { CalendarView *cal_view; CalendarViewPrivate *priv; @@ -112,8 +112,8 @@ calendar_view_destroy (GtkObject *object) g_free (priv); cal_view->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