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/alarm-notify/alarm-notify.c | 2 +- calendar/gui/calendar-model.c | 14 +++++++------- calendar/gui/calendar-view.c | 14 +++++++------- calendar/gui/comp-editor-factory.c | 16 ++++++++-------- calendar/gui/e-day-view.c | 12 ++++++------ calendar/gui/e-week-view.c | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 290fbd2617..aefdceeeb1 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -334,7 +334,7 @@ AlarmNotify_removeCalendar (PortableServer_Servant servant, g_hash_table_remove (priv->uri_client_hash, str_uri); g_free (orig_str); - g_signal_handlers_disconnect_matched (GTK_OBJECT (lc->client), + g_signal_handlers_disconnect_matched (lc->client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, lc); if (lc->timeout_id != -1) 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); } 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); } 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); } diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index ce74f4793c..e580c04b79 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3262,7 +3262,7 @@ e_day_view_on_long_event_button_press (EDayView *day_view, gtk_widget_grab_focus (GTK_WIDGET (day_view)); if (!destroyed) { - gtk_signal_disconnect (GTK_OBJECT (e->comp), id); + g_signal_handler_disconnect (e->comp, id); e_day_view_set_selected_time_range_in_top_visible (day_view, e->start, e->end); @@ -3314,7 +3314,7 @@ e_day_view_on_event_button_press (EDayView *day_view, gtk_widget_grab_focus (GTK_WIDGET (day_view)); if (!destroyed) { - gtk_signal_disconnect (GTK_OBJECT (e->comp), id); + g_signal_handler_disconnect (e->comp, id); e_day_view_set_selected_time_range_visible (day_view, e->start, e->end); @@ -3372,7 +3372,7 @@ e_day_view_on_long_event_click (EDayView *day_view, if (destroyed) return; - gtk_signal_disconnect (GTK_OBJECT (event->comp), id); + g_signal_handler_disconnect (event->comp, id); if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE, GDK_POINTER_MOTION_MASK @@ -3452,7 +3452,7 @@ e_day_view_on_event_click (EDayView *day_view, if (destroyed) return; - gtk_signal_disconnect (GTK_OBJECT (event->comp), id); + g_signal_handler_disconnect (event->comp, id); if (gdk_pointer_grab (GTK_LAYOUT (day_view->main_canvas)->bin_window, FALSE, GDK_POINTER_MOTION_MASK @@ -3604,7 +3604,7 @@ e_day_view_on_event_double_click (EDayView *day_view, e_day_view_stop_editing_event (day_view); if (!destroyed) { - gtk_signal_disconnect (GTK_OBJECT (event->comp), id); + g_signal_handler_disconnect (event->comp, id); if (day_view->calendar) gnome_calendar_edit_object (day_view->calendar, event->comp, FALSE); @@ -4135,7 +4135,7 @@ e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data) e_day_view_stop_editing_event (day_view); if (!destroyed) { - gtk_signal_disconnect (GTK_OBJECT (event->comp), id); + g_signal_handler_disconnect (event->comp, id); e_day_view_delete_event_internal (day_view, event); } diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index c30839c675..a9a0beaadc 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3090,7 +3090,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, gtk_widget_grab_focus (GTK_WIDGET (week_view)); if (!destroyed) { - gtk_signal_disconnect (GTK_OBJECT (e->comp), id); + g_signal_handler_disconnect (e->comp, id); e_week_view_set_selected_time_range_visible (week_view, e->start, e->end); -- cgit v1.2.3