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/comp-editor-factory.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'calendar/gui/comp-editor-factory.c') diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index 2588d9be59..3f1008d7ba 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -91,7 +91,7 @@ struct CompEditorFactoryPrivate { static void comp_editor_factory_class_init (CompEditorFactoryClass *class); static void comp_editor_factory_init (CompEditorFactory *factory); -static void comp_editor_factory_destroy (GtkObject *object); +static void comp_editor_factory_finalize (GObject *object); static void impl_editExisting (PortableServer_Servant servant, const CORBA_char *str_uri, @@ -115,16 +115,16 @@ BONOBO_TYPE_FUNC_FULL (CompEditorFactory, static void comp_editor_factory_class_init (CompEditorFactoryClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = (GtkObjectClass *) class; + object_class = (GObjectClass *) class; - parent_class = gtk_type_class (BONOBO_OBJECT_TYPE); + parent_class = g_type_class_peek_parent (class); class->epv.editExisting = impl_editExisting; class->epv.editNew = impl_editNew; - object_class->destroy = comp_editor_factory_destroy; + object_class->finalize = comp_editor_factory_finalize; } /* Object initialization function for the component editor factory */ @@ -187,7 +187,7 @@ free_client_cb (gpointer key, gpointer value, gpointer data) /* Destroy handler for the component editor factory */ static void -comp_editor_factory_destroy (GtkObject *object) +comp_editor_factory_finalize (GObject *object) { CompEditorFactory *factory; CompEditorFactoryPrivate *priv; @@ -205,8 +205,8 @@ comp_editor_factory_destroy (GtkObject *object) g_free (priv); factory->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