From e0dfbb056c3dcdbc1a29823b6c273901ade29598 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 8 Nov 2002 22:11:10 +0000 Subject: Use g_object_set_data(..., NULL) instead of gtk_object_remove_data(). * gui/calendar-commands.c (calendar_control_deactivate): Use g_object_set_data(..., NULL) instead of gtk_object_remove_data(). * gui/calendar-commands.c: Use g_object_{set,get}_* functions instead of gtk_object_{set,get}_*. * gui/calendar-commands.c: Likewise. * gui/calendar-config.c: Likewise. * gui/control-factory.c: Likewise. * gui/e-calendar-table.c: Likewise. * gui/e-comp-editor-registry.c: Likewise. * gui/e-day-view-main-item.c: Likewise. * gui/e-day-view-time-item.c: Likewise. * gui/e-day-view-top-item.c: Likewise. * gui/e-day-view.c: Likewise. * gui/e-meeting-attendee.c: Likewise. * gui/e-meeting-model.c: Likewise. * gui/e-meeting-time-sel-item.c: Likewise. * gui/e-meeting-time-sel.c: Likewise. * gui/e-week-view-event-item.c: Likewise. * gui/e-week-view-layout.c: Likewise. * gui/e-week-view-main-item.c: Likewise. * gui/e-week-view-titles-item.c: Likewise. * gui/e-week-view.c: Likewise. * gui/gnome-cal.c: Likewise. * gui/print.c: Likewise. svn path=/trunk/; revision=18674 --- calendar/ChangeLog | 68 ++++++++++++++++++++++++---------- calendar/gui/calendar-commands.c | 12 +++--- calendar/gui/calendar-config.c | 12 +++--- calendar/gui/e-calendar-table.c | 78 +++++++++++++++++++-------------------- calendar/gui/e-day-view.c | 34 ++++++++--------- calendar/gui/e-meeting-model.c | 4 +- calendar/gui/e-meeting-time-sel.c | 4 +- calendar/gui/e-week-view.c | 16 ++------ calendar/gui/gnome-cal.c | 38 +++++++++---------- 9 files changed, 140 insertions(+), 126 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 729ac4530d..7e3d14abec 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,25 +1,53 @@ 2002-11-08 Ettore Perazzoli - * calendar-commands.c: Use g_object_ref()/g_object_unref() instead - of gtk_object_ref/gtk_object_unref(). - * calendar-config.c: Likewise. - * calendar-model.c: Likewise. - * comp-editor-factory.c: Likewise. - * comp-util.c: Likewise. - * e-calendar-table.c: Likewise. - * e-day-view.c: Likewise. - * e-itip-control.c: Likewise. - * e-meeting-model.c: Likewise. - * e-meeting-time-sel.c: Likewise. - * e-tasks.c: Likewise. - * e-timezone-entry.c: Likewise. - * e-week-view.c: Likewise. - * gnome-cal.c: Likewise. - * goto.c: Likewise. - * itip-utils.c: Likewise. - * print.c: Likewise. - * tasks-control.c: Likewise. - * tasks-migrate.c: Likewise. + * gui/calendar-commands.c (calendar_control_deactivate): Use + g_object_set_data(..., NULL) instead of gtk_object_remove_data(). + + * gui/calendar-commands.c: Use g_object_{set,get}_* functions + instead of gtk_object_{set,get}_*. + * gui/calendar-commands.c: Likewise. + * gui/calendar-config.c: Likewise. + * gui/control-factory.c: Likewise. + * gui/e-calendar-table.c: Likewise. + * gui/e-comp-editor-registry.c: Likewise. + * gui/e-day-view-main-item.c: Likewise. + * gui/e-day-view-time-item.c: Likewise. + * gui/e-day-view-top-item.c: Likewise. + * gui/e-day-view.c: Likewise. + * gui/e-meeting-attendee.c: Likewise. + * gui/e-meeting-model.c: Likewise. + * gui/e-meeting-time-sel-item.c: Likewise. + * gui/e-meeting-time-sel.c: Likewise. + * gui/e-week-view-event-item.c: Likewise. + * gui/e-week-view-layout.c: Likewise. + * gui/e-week-view-main-item.c: Likewise. + * gui/e-week-view-titles-item.c: Likewise. + * gui/e-week-view.c: Likewise. + * gui/gnome-cal.c: Likewise. + * gui/print.c: Likewise. + +2002-11-08 Ettore Perazzoli + + * gui/calendar-commands.c: Use g_object_ref()/g_object_unref() + instead of gtk_object_ref/gtk_object_unref(). + * gui/calendar-config.c: Likewise. + * gui/calendar-model.c: Likewise. + * gui/comp-editor-factory.c: Likewise. + * gui/comp-util.c: Likewise. + * gui/e-calendar-table.c: Likewise. + * gui/e-day-view.c: Likewise. + * gui/e-itip-control.c: Likewise. + * gui/e-meeting-model.c: Likewise. + * gui/e-meeting-time-sel.c: Likewise. + * gui/e-tasks.c: Likewise. + * gui/e-timezone-entry.c: Likewise. + * gui/e-week-view.c: Likewise. + * gui/gnome-cal.c: Likewise. + * gui/goto.c: Likewise. + * gui/itip-utils.c: Likewise. + * gui/print.c: Likewise. + * gui/tasks-control.c: Likewise. + * gui/tasks-migrate.c: Likewise. * gui/cal-search-bar.c: Use g_object_new() instead of gtk_type_new(). diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 6888fad5a4..edce58a44a 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -477,7 +477,7 @@ control_util_show_settings (GnomeCalendar *gcal) GNOME_Evolution_ShellView shell_view; CORBA_Environment ev; - control = gtk_object_get_data (GTK_OBJECT (gcal), "control"); + control = g_object_get_data (G_OBJECT (gcal), "control"); if (control == NULL) return; @@ -601,7 +601,7 @@ gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data) control = BONOBO_CONTROL (data); - focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data"); + focus = g_object_get_data (G_OBJECT (control), "focus_data"); g_assert (focus != NULL); if (in) { @@ -627,7 +627,7 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data) control = BONOBO_CONTROL (data); - focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data"); + focus = g_object_get_data (G_OBJECT (control), "focus_data"); g_assert (focus != NULL); if (in) { @@ -754,7 +754,7 @@ calendar_control_activate (BonoboControl *control, focus->calendar_focused = FALSE; focus->taskpad_focused = FALSE; - gtk_object_set_data (GTK_OBJECT (control), "focus_data", focus); + g_object_set_data (G_OBJECT (control), "focus_data", focus); } void @@ -768,10 +768,10 @@ calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal) gnome_calendar_set_ui_component (gcal, uic); - focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data"); + focus = g_object_get_data (G_OBJECT (control), "focus_data"); g_assert (focus != NULL); - gtk_object_remove_data (GTK_OBJECT (control), "focus_data"); + g_object_set_data (G_OBJECT (control), "focus_data", NULL); g_free (focus); gnome_calendar_discard_view_menus (gcal); diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index b60788b20f..0d62e661ee 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -594,14 +594,14 @@ calendar_config_configure_e_cell_date_edit (ECellDateEdit *ecde) end_hour++; e_cell_date_edit_freeze (ecde); - gtk_object_set (GTK_OBJECT (ecde), - "use_24_hour_format", use_24_hour, + g_object_set (G_OBJECT (ecde), + "use_24_hour_format", use_24_hour, #if 0 - /* We use the default 0 - 24 now. */ - "lower_hour", start_hour, - "upper_hour", end_hour, + /* We use the default 0 - 24 now. */ + "lower_hour", start_hour, + "upper_hour", end_hour, #endif - NULL); + NULL); e_cell_date_edit_thaw (ecde); e_cell_date_edit_text_set_timezone (ecd, zone); diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index cf24e19700..29fe7910b0 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -344,11 +344,11 @@ e_calendar_table_init (ECalendarTable *cal_table) * Normal string fields. */ cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + NULL); e_table_extras_add_cell (extras, "calstring", cell); @@ -357,11 +357,11 @@ e_calendar_table_init (ECalendarTable *cal_table) * Date fields. */ cell = e_cell_date_edit_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + NULL); popup_cell = e_cell_date_edit_new (); e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell); @@ -380,12 +380,12 @@ e_calendar_table_init (ECalendarTable *cal_table) /* Classification field. */ cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - "editable", FALSE, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + "editable", FALSE, + NULL); popup_cell = e_cell_combo_new (); e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell); @@ -402,12 +402,12 @@ e_calendar_table_init (ECalendarTable *cal_table) /* Priority field. */ cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - "editable", FALSE, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + "editable", FALSE, + NULL); popup_cell = e_cell_combo_new (); e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell); @@ -425,11 +425,11 @@ e_calendar_table_init (ECalendarTable *cal_table) /* Percent field. */ cell = e_cell_percent_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + NULL); popup_cell = e_cell_combo_new (); e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell); @@ -454,12 +454,12 @@ e_calendar_table_init (ECalendarTable *cal_table) /* Transparency field. */ cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - "editable", FALSE, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + "editable", FALSE, + NULL); popup_cell = e_cell_combo_new (); e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell); @@ -475,12 +475,12 @@ e_calendar_table_init (ECalendarTable *cal_table) /* Status field. */ cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), - "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, - "bold_column", CAL_COMPONENT_FIELD_OVERDUE, - "color_column", CAL_COMPONENT_FIELD_COLOR, - "editable", FALSE, - NULL); + g_object_set (G_OBJECT (cell), + "strikeout_column", CAL_COMPONENT_FIELD_COMPLETE, + "bold_column", CAL_COMPONENT_FIELD_OVERDUE, + "color_column", CAL_COMPONENT_FIELD_COLOR, + "editable", FALSE, + NULL); popup_cell = e_cell_combo_new (); e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 31f210e17e..e7d1888d34 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -5269,9 +5269,7 @@ e_day_view_reshape_long_event (EDayView *day_view, text_w = item_w; } else { /* Get the requested size of the label. */ - gtk_object_get (GTK_OBJECT (event->canvas_item), - "text", &text, - NULL); + g_object_get (G_OBJECT (event->canvas_item), "text", &text, NULL); text_width = 0; if (text) { end_of_line = strchr (text, '\n'); @@ -5443,12 +5441,12 @@ e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view) hide the resize bars. */ if (day != -1 && day == day_view->drag_event_day && event_num == day_view->drag_event_num) { - gtk_object_get (GTK_OBJECT (day_view->drag_rect_item), - "x1", &x, - "y1", &y, - "x2", &w, - "y2", &h, - NULL); + g_object_get (G_OBJECT (day_view->drag_rect_item), + "x1", &x, + "y1", &y, + "x2", &w, + "y2", &h, + NULL); w -= x; x++; h -= y; @@ -6012,9 +6010,9 @@ e_day_view_start_editing_event (EDayView *day_view, } /* Try to move the cursor to the end of the text. */ - gtk_object_get (GTK_OBJECT (event->canvas_item), - "event_processor", &event_processor, - NULL); + g_object_get (G_OBJECT (event->canvas_item), + "event_processor", &event_processor, + NULL); if (event_processor) { command.action = E_TEP_MOVE; command.position = E_TEP_END_OF_BUFFER; @@ -6063,9 +6061,9 @@ cancel_editing (EDayView *day_view) /* Reset the text to what was in the component */ cal_component_get_summary (event->comp, &summary); - gtk_object_set (GTK_OBJECT (event->canvas_item), - "text", summary.value ? summary.value : "", - NULL); + g_object_set (G_OBJECT (event->canvas_item), + "text", summary.value ? summary.value : "", + NULL); /* Stop editing */ e_day_view_stop_editing_event (day_view); @@ -6207,9 +6205,9 @@ e_day_view_on_editing_stopped (EDayView *day_view, day_view->resize_bars_event_day = -1; day_view->resize_bars_event_num = -1; - gtk_object_get (GTK_OBJECT (event->canvas_item), - "text", &text, - NULL); + g_object_get (G_OBJECT (event->canvas_item), + "text", &text, + NULL); g_assert (text != NULL); if (string_is_empty (text) && !cal_comp_is_on_server (event->comp, day_view->client)) { diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index ecd3988995..af89468255 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -880,7 +880,7 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil etable = e_table_scrolled_new_from_spec_file (model, extras, spec_file, NULL); real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (etable)); - gtk_object_set (GTK_OBJECT (real_table), "uniform_row_height", TRUE, NULL); + g_object_set (G_OBJECT (real_table), "uniform_row_height", TRUE, NULL); e_table_load_state (real_table, state_file); #if 0 @@ -1630,7 +1630,7 @@ e_meeting_model_etable_click_to_add (EMeetingModel *im, gboolean click_to_add) ets = l->data; real_table = e_table_scrolled_get_table (ets); - gtk_object_set (GTK_OBJECT (real_table), "use_click_to_add", click_to_add, NULL); + g_object_set (G_OBJECT (real_table), "use_click_to_add", click_to_add, NULL); } } diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 058be4b1fc..e990fb2489 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -349,7 +349,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em filename = g_strdup_printf ("%s/config/et-header-meeting-time-sel", evolution_dir); mts->model = emm; if (mts->model) - gtk_object_ref (GTK_OBJECT (mts->model)); + g_object_ref (mts->model); g_signal_connect (mts->model, "model_rows_inserted", G_CALLBACK (rows_inserted_cb), mts); g_signal_connect (mts->model, "model_cell_changed", G_CALLBACK (cell_changed_cb), mts); @@ -1399,7 +1399,7 @@ e_meeting_time_selector_on_invite_others_button_draw (GtkWidget *button, gboolean click_to_add = TRUE; real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable)); - gtk_object_get (GTK_OBJECT (real_table), "use_click_to_add", &click_to_add, NULL); + g_object_get (G_OBJECT (real_table), "use_click_to_add", &click_to_add, NULL); gtk_widget_set_sensitive (button, click_to_add); } diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 413f2ef0de..88a6565e16 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2789,9 +2789,7 @@ e_week_view_reshape_event_span (EWeekView *week_view, /* Get the width of the text of the event. This is a bit of a hack. It would be better if EText could tell us this. */ - gtk_object_get (GTK_OBJECT (span->text_item), - "text", &text, - NULL); + g_object_get (G_OBJECT (span->text_item), "text", &text, NULL); text_width = 0; if (text) { /* It should only have one line of text in it. @@ -2943,9 +2941,7 @@ e_week_view_start_editing_event (EWeekView *week_view, e_canvas_item_grab_focus (span->text_item, TRUE); /* Try to move the cursor to the end of the text. */ - gtk_object_get (GTK_OBJECT (span->text_item), - "event_processor", &event_processor, - NULL); + g_object_get (G_OBJECT (span->text_item), "event_processor", &event_processor, NULL); if (event_processor) { command.action = E_TEP_MOVE; command.position = E_TEP_END_OF_BUFFER; @@ -2992,9 +2988,7 @@ cancel_editing (EWeekView *week_view) /* Reset the text to what was in the component */ cal_component_get_summary (event->comp, &summary); - gtk_object_set (GTK_OBJECT (span->text_item), - "text", summary.value ? summary.value : "", - NULL); + g_object_set (G_OBJECT (span->text_item), "text", summary.value ? summary.value : "", NULL); /* Stop editing */ e_week_view_stop_editing_event (week_view); @@ -3218,9 +3212,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, if (!uid) return; - gtk_object_get (GTK_OBJECT (span->text_item), - "text", &text, - NULL); + g_object_get (G_OBJECT (span->text_item), "text", &text, NULL); g_assert (text != NULL); if (string_is_empty (text) && !cal_comp_is_on_server (event->comp, week_view->client)) { diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index b095217b34..a527369594 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1272,9 +1272,9 @@ set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, /* For the week & month views we want the selection in the date navigator to be rounded to the nearest week when the arrow buttons are pressed to move to the previous/next month. */ - gtk_object_set (GTK_OBJECT (priv->date_navigator->calitem), - "round_selection_when_moving", round_selection, - NULL); + g_object_set (G_OBJECT (priv->date_navigator->calitem), + "round_selection_when_moving", round_selection, + NULL); } /** @@ -1472,10 +1472,10 @@ gnome_calendar_set_pane_positions (GnomeCalendar *gcal) e_calendar_get_border_size (priv->date_navigator, &top_border, &bottom_border, &left_border, &right_border); - gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem), - "row_height", &row_height, - "column_width", &col_width, - NULL); + g_object_get (G_OBJECT (priv->date_navigator->calitem), + "row_height", &row_height, + "column_width", &col_width, + NULL); if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) { right_pane_width = priv->hpane_pos_month_view; @@ -2643,10 +2643,10 @@ gnome_calendar_update_paned_quanta (GnomeCalendar *gcal) e_calendar_get_border_size (priv->date_navigator, &top_border, &bottom_border, &left_border, &right_border); - gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem), - "row_height", &row_height, - "column_width", &col_width, - NULL); + g_object_get (G_OBJECT (priv->date_navigator->calitem), + "row_height", &row_height, + "column_width", &col_width, + NULL); /* The EPaned quantum feature works better if we add on the calendar borders to the quantum size. Otherwise if you shrink the date @@ -2661,12 +2661,8 @@ gnome_calendar_update_paned_quanta (GnomeCalendar *gcal) resize the widgets as the bar is dragged. Otherwise the user has to mess around to get the number of months that they want. */ #if 1 - gtk_object_set (GTK_OBJECT (priv->hpane), - "quantum", (guint) col_width, - NULL); - gtk_object_set (GTK_OBJECT (priv->vpane), - "quantum", (guint) row_height, - NULL); + g_object_set (G_OBJECT (priv->hpane), "quantum", (guint) col_width, NULL); + g_object_set (G_OBJECT (priv->vpane), "quantum", (guint) row_height, NULL); #endif gnome_calendar_set_pane_positions (gcal); @@ -2690,10 +2686,10 @@ gnome_calendar_on_date_navigator_size_allocate (GtkWidget *widget, e_calendar_get_border_size (priv->date_navigator, &top_border, &bottom_border, &left_border, &right_border); - gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem), - "row_height", &row_height, - "column_width", &col_width, - NULL); + g_object_get (G_OBJECT (priv->date_navigator->calitem), + "row_height", &row_height, + "column_width", &col_width, + NULL); /* We subtract one from each dimension since we added 1 in set_view(). */ -- cgit v1.2.3