diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-20 07:42:33 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-20 08:08:01 +0800 |
commit | 8e2902eefc466c662bd7bef0533de05db0897c49 (patch) | |
tree | 60390d16d242307e7dfc3310149e23acf1f225bf /calendar | |
parent | 88c48563537f3e7777193ff9ba5d9418f0038390 (diff) | |
download | gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.gz gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.zst gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.zip |
Bump GDK_VERSION_MIN_REQUIRED to GDK_VERSION_3_2.
Clean up resulting deprecation warnings, which were all related to
GtkOrientable consolidation (e.g. gtk_hbox_new() -> gtk_box_new()).
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 2 | ||||
-rw-r--r-- | calendar/gui/dialogs/recur-comp.c | 4 | ||||
-rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 6 | ||||
-rw-r--r-- | calendar/gui/e-calendar-view.c | 12 | ||||
-rw-r--r-- | calendar/gui/e-day-view.c | 11 | ||||
-rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 26 | ||||
-rw-r--r-- | calendar/gui/e-memo-table.c | 4 | ||||
-rw-r--r-- | calendar/gui/e-task-table.c | 4 | ||||
-rw-r--r-- | calendar/gui/e-week-view.c | 3 | ||||
-rw-r--r-- | calendar/importers/icalendar-importer.c | 6 |
10 files changed, 42 insertions, 36 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 5fa87e861a..2dd0b2d13b 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2133,7 +2133,7 @@ comp_editor_init (CompEditor *editor) container = GTK_WIDGET (editor); - widget = gtk_vbox_new (FALSE, 0); + widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index 434d552a40..460438844d 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -74,7 +74,7 @@ recur_component_dialog (ECalClient *client, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_container_add (GTK_CONTAINER (content_area), hbox); placeholder = gtk_label_new (""); @@ -82,7 +82,7 @@ recur_component_dialog (ECalClient *client, gtk_box_pack_start (GTK_BOX (hbox), placeholder, FALSE, FALSE, 0); gtk_widget_show (placeholder); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index d5a93ea9db..09dad77bef 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -1039,7 +1039,7 @@ make_weekly_special (RecurrencePage *rpage) /* Create the widgets */ - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_container_add (GTK_CONTAINER (priv->special), hbox); /* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]' @@ -1333,7 +1333,7 @@ make_monthly_special (RecurrencePage *rpage) /* Create the widgets */ - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_container_add (GTK_CONTAINER (priv->special), hbox); /* TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]' @@ -1514,7 +1514,7 @@ make_ending_count_special (RecurrencePage *rpage) /* Create the widgets */ - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_container_add (GTK_CONTAINER (priv->ending_special), hbox); adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 0)); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index d5ce9f362a..cf01231502 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1957,7 +1957,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data) if (!e_cal_component_set_icalcomponent (newcomp, clone_comp)) g_warning ("couldn't update calendar component with modified data from backend\n"); - box = gtk_vbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); str = e_calendar_view_get_icalcomponent_summary (pevent->comp_data->client, pevent->comp_data->icalcomp, &free_text); @@ -1978,7 +1978,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data) str = NULL; } - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0); ebox = gtk_event_box_new (); gtk_container_add ((GtkContainer *) ebox, hbox); @@ -2003,7 +2003,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data) tmp = g_strdup_printf (_("Organizer: %s"), organiser.cn); label = gtk_label_new (tmp); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0); ebox = gtk_event_box_new (); gtk_container_add ((GtkContainer *) ebox, hbox); @@ -2019,7 +2019,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data) tmp = g_markup_printf_escaped (_("Location: %s"), str); label = gtk_label_new (NULL); gtk_label_set_markup ((GtkLabel *) label, tmp); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0); ebox = gtk_event_box_new (); gtk_container_add ((GtkContainer *) ebox, hbox); @@ -2063,7 +2063,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data) e_cal_component_free_datetime (&dtstart); e_cal_component_free_datetime (&dtend); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start ((GtkBox *) hbox, gtk_label_new_with_mnemonic (tmp), FALSE, FALSE, 0); ebox = gtk_event_box_new (); gtk_container_add ((GtkContainer *) ebox, hbox); @@ -2076,7 +2076,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data) tmp = e_cal_model_get_attendees_status_info ( model, newcomp, pevent->comp_data->client); if (tmp) { - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start ((GtkBox *) hbox, gtk_label_new (tmp), FALSE, FALSE, 0); ebox = gtk_event_box_new (); gtk_container_add ((GtkContainer *) ebox, hbox); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 30eed74413..c18522a035 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1038,7 +1038,7 @@ e_day_view_init (EDayView *day_view) /* * Top Canvas */ - w = gtk_vbox_new (FALSE, 0); + w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); day_view->top_dates_canvas = e_canvas_new (); gtk_box_pack_start (GTK_BOX (w), day_view->top_dates_canvas, TRUE, TRUE, 0); @@ -1236,13 +1236,15 @@ e_day_view_init (EDayView *day_view) */ scrollable = GTK_SCROLLABLE (day_view->main_canvas); adjustment = gtk_scrollable_get_hadjustment (scrollable); - day_view->mc_hscrollbar = gtk_hscrollbar_new (adjustment); + day_view->mc_hscrollbar = gtk_scrollbar_new ( + GTK_ORIENTATION_HORIZONTAL, adjustment); gtk_table_attach (GTK_TABLE (day_view), day_view->mc_hscrollbar, 1, 2, 2, 3, GTK_FILL, 0, 0, 0); gtk_widget_show (day_view->mc_hscrollbar); scrollable = GTK_SCROLLABLE (day_view->top_canvas); adjustment = gtk_scrollable_get_vadjustment (scrollable); - day_view->tc_vscrollbar = gtk_vscrollbar_new (adjustment); + day_view->tc_vscrollbar = gtk_scrollbar_new ( + GTK_ORIENTATION_VERTICAL, adjustment); gtk_table_attach ( GTK_TABLE (day_view), day_view->tc_vscrollbar, 2, 3, 0, 1, 0, GTK_FILL, 0, 0); @@ -1250,7 +1252,8 @@ e_day_view_init (EDayView *day_view) scrollable = GTK_SCROLLABLE (day_view->main_canvas); adjustment = gtk_scrollable_get_vadjustment (scrollable); - day_view->vscrollbar = gtk_vscrollbar_new (adjustment); + day_view->vscrollbar = gtk_scrollbar_new ( + GTK_ORIENTATION_VERTICAL, adjustment); gtk_table_attach ( GTK_TABLE (day_view), day_view->vscrollbar, 2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0); diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 1e84747979..fa68b4aaec 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -427,17 +427,17 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, mts->auto_scroll_timeout_id = 0; - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_table_attach ( GTK_TABLE (mts), vbox, 0, 1, 0, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (vbox); - mts->attendees_vbox_spacer = gtk_vbox_new (FALSE, 0); + mts->attendees_vbox_spacer = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox_spacer, FALSE, FALSE, 0); gtk_widget_show (mts->attendees_vbox_spacer); - mts->attendees_vbox = gtk_vbox_new (FALSE, 0); + mts->attendees_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox, TRUE, TRUE, 0); gtk_widget_show (mts->attendees_vbox); @@ -537,7 +537,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, GTK_SCROLLED_WINDOW (sw), adjustment); adjustment = gtk_scrollable_get_hadjustment (scrollable); - mts->hscrollbar = gtk_hscrollbar_new (adjustment); + mts->hscrollbar = gtk_scrollbar_new ( + GTK_ORIENTATION_HORIZONTAL, adjustment); gtk_adjustment_set_step_increment (adjustment, mts->day_width); gtk_table_attach ( GTK_TABLE (mts), mts->hscrollbar, @@ -545,7 +546,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, gtk_widget_show (mts->hscrollbar); adjustment = gtk_scrollable_get_vadjustment (scrollable); - mts->vscrollbar = gtk_vscrollbar_new (adjustment); + mts->vscrollbar = gtk_scrollbar_new ( + GTK_ORIENTATION_VERTICAL, adjustment); gtk_adjustment_set_step_increment (adjustment, mts->row_height); gtk_table_attach ( GTK_TABLE (mts), mts->vscrollbar, @@ -567,7 +569,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, NULL); /* Create the hbox containing the color key. */ - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_table_attach ( GTK_TABLE (mts), hbox, 1, 4, 3, 4, GTK_FILL, 0, 0, 8); @@ -580,14 +582,14 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, mts, hbox, _("No Information"), NULL); - separator = gtk_hseparator_new (); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_table_attach ( GTK_TABLE (mts), separator, 0, 5, 4, 5, GTK_FILL, 0, 6, 6); gtk_widget_show (separator); /* Create the Invite Others & Options buttons on the left. */ - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_table_attach ( GTK_TABLE (mts), hbox, 0, 1, 3, 4, GTK_FILL, 0, 0, 0); @@ -613,7 +615,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, mts->options_button, "clicked", G_CALLBACK (e_meeting_time_selector_on_options_button_clicked), mts); - child_hbox = gtk_hbox_new (FALSE, 2); + child_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_container_add (GTK_CONTAINER (mts->options_button), child_hbox); gtk_widget_show (child_hbox); @@ -677,7 +679,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, gtk_widget_show (menuitem); /* Create the 3 AutoPick buttons on the left. */ - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_table_attach ( GTK_TABLE (mts), hbox, 0, 1, 5, 6, GTK_FILL, 0, 0, 0); @@ -700,7 +702,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts, gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 6); gtk_widget_show (mts->autopick_button); - child_hbox = gtk_hbox_new (FALSE, 2); + child_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_container_add (GTK_CONTAINER (mts->autopick_button), child_hbox); gtk_widget_show (child_hbox); @@ -932,7 +934,7 @@ e_meeting_time_selector_add_key_color (EMeetingTimeSelector *mts, { GtkWidget *child_hbox, *darea, *label; - child_hbox = gtk_hbox_new (FALSE, 4); + child_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_box_pack_start (GTK_BOX (hbox), child_hbox, TRUE, TRUE, 0); gtk_widget_show (child_hbox); diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 7d60f84877..ea8f645acc 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -491,7 +491,7 @@ memo_table_query_tooltip (GtkWidget *widget, return FALSE; } - box = gtk_vbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); str = e_calendar_view_get_icalcomponent_summary ( comp_data->client, comp_data->icalcomp, &free_text); @@ -522,7 +522,7 @@ memo_table_query_tooltip (GtkWidget *widget, w = gtk_event_box_new (); gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_NORMAL])); - l = gtk_vbox_new (FALSE, 0); + l = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (w), l); gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0); w = l; diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c index cda4896292..f270d1f93f 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -779,7 +779,7 @@ task_table_query_tooltip (GtkWidget *widget, return FALSE; } - box = gtk_vbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); str = e_calendar_view_get_icalcomponent_summary ( comp_data->client, comp_data->icalcomp, &free_text); @@ -810,7 +810,7 @@ task_table_query_tooltip (GtkWidget *widget, w = gtk_event_box_new (); gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_NORMAL])); - l = gtk_vbox_new (FALSE, 0); + l = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (w), l); gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0); w = l; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 2e00d3b078..5d140832fe 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -851,7 +851,8 @@ e_week_view_init (EWeekView *week_view) */ adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0, -52, 52, 1, 1, 1)); - week_view->vscrollbar = gtk_vscrollbar_new (adjustment); + week_view->vscrollbar = gtk_scrollbar_new ( + GTK_ORIENTATION_VERTICAL, adjustment); gtk_table_attach ( GTK_TABLE (week_view), week_view->vscrollbar, 2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0); diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 7887cc8095..891dc7b226 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -297,9 +297,9 @@ ivcal_getwidget (EImport *ei, shell = e_shell_get_default (); registry = e_shell_get_registry (shell); - vbox = gtk_vbox_new (FALSE, FALSE); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - hbox = gtk_hbox_new (FALSE, FALSE); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 6); nb = gtk_notebook_new (); @@ -1067,7 +1067,7 @@ gnome_calendar_getwidget (EImport *ei, g_datalist_set_data (&target->data, "gnomecal-do-cal", GINT_TO_POINTER (!done_cal)); g_datalist_set_data (&target->data, "gnomecal-do-tasks", GINT_TO_POINTER (!done_tasks)); - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); w = gtk_check_button_new_with_label (_("Calendar Events")); gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_cal); |