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()).

82 files changed, 210 insertions, 204 deletions

diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index cb2f6055ae..459ae8a62f 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -394,7 +394,7 @@ mergeit (EContactMergingLookup *lookup)
 						continue;
 				}
 				label = gtk_label_new (_("Email"));
-				hbox = gtk_hbox_new (FALSE, 0);
+				hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 				gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
 				gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1);
 
@@ -413,7 +413,7 @@ mergeit (EContactMergingLookup *lookup)
 					dropdown, "changed",
 					G_CALLBACK (dropdown_changed), data);
 
-				hbox = gtk_hbox_new (FALSE, 0);
+				hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 				gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) dropdown, FALSE, FALSE, 0);
 				gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1);
 				gtk_widget_show ((GtkWidget *) dropdown);
@@ -422,12 +422,12 @@ mergeit (EContactMergingLookup *lookup)
 			if (((field == E_CONTACT_FULL_NAME) && (!g_ascii_strcasecmp (string, string1)))) {
 				row++;
 				label = gtk_label_new (e_contact_pretty_name (field));
-				hbox = gtk_hbox_new (FALSE, 0);
+				hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 				gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
 				gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1);
 
 				label = gtk_label_new (string);
-				hbox = gtk_hbox_new (FALSE, 0);
+				hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 				gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
 				gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1);
 				continue;
@@ -437,7 +437,7 @@ mergeit (EContactMergingLookup *lookup)
 			if (!(string1 && *string1) || (g_ascii_strcasecmp (string, string1))) {
 				row++;
 				label = gtk_label_new (e_contact_pretty_name (field));
-				hbox = gtk_hbox_new (FALSE, 0);
+				hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 				gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
 				gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1);
 				data = g_new0 (dropdown_data, 1);
@@ -461,7 +461,7 @@ mergeit (EContactMergingLookup *lookup)
 					dropdown, "changed",
 					G_CALLBACK (dropdown_changed), data);
 
-				hbox = gtk_hbox_new (FALSE, 0);
+				hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 				gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) dropdown, FALSE, FALSE, 0);
 				gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1);
 				gtk_widget_show_all ((GtkWidget *) dropdown);
diff --git a/addressbook/gui/widgets/e-contact-map-window.c b/addressbook/gui/widgets/e-contact-map-window.c
index aa31f297fe..1dbe694d50 100644
--- a/addressbook/gui/widgets/e-contact-map-window.c
+++ b/addressbook/gui/widgets/e-contact-map-window.c
@@ -387,7 +387,7 @@ e_contact_map_window_init (EContactMapWindow *window)
 		G_CALLBACK (map_contact_geocoding_failed_cb), window);
 
 	/* HBox container */
-	hbox = gtk_hbox_new (FALSE, 7);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 7);
 
 	/* Spinner */
 	button = gtk_spinner_new ();
@@ -443,7 +443,7 @@ e_contact_map_window_init (EContactMapWindow *window)
 	viewport = gtk_frame_new (NULL);
 	gtk_container_add (GTK_CONTAINER (viewport), map);
 
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (vbox), viewport);
 	gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 9a850e695c..38ba5cacbf 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -772,7 +772,7 @@ csv_getwidget (EImport *ei,
 	ESource *primary;
 	const gchar *extension_name;
 
-	vbox = gtk_vbox_new (FALSE, FALSE);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
 	shell = e_shell_get_default ();
 	registry = e_shell_get_registry (shell);
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index e50ef48261..3ecde6f6f3 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -571,7 +571,7 @@ ldif_getwidget (EImport *ei,
 	ESource *primary;
 	const gchar *extension_name;
 
-	vbox = gtk_vbox_new (FALSE, FALSE);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
 	shell = e_shell_get_default ();
 	registry = e_shell_get_registry (shell);
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index fd5984135e..b7ee8660ca 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -411,7 +411,7 @@ vcard_getwidget (EImport *ei,
 	ESource *primary;
 	const gchar *extension_name;
 
-	vbox = gtk_vbox_new (FALSE, FALSE);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
 	shell = e_shell_get_default ();
 	registry = e_shell_get_registry (shell);
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);
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index b3846b40ce..297f815951 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -924,7 +924,7 @@ composer_header_table_constructed (GObject *object)
 			table->priv->signature_combo_box,
 			3, 4, ii, ii + 1, 0, 0, 0, row_padding);
 	} else {
-		GtkWidget *box = gtk_hbox_new (FALSE, 0);
+		GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
 		gtk_box_pack_start (
 			GTK_BOX (box),
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 514a48568b..8331174f20 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -318,9 +318,9 @@ e_composer_private_constructed (EMsgComposer *composer)
 		container = e_attachment_paned_get_controls_container (
 			E_ATTACHMENT_PANED (widget));
 
-		tmp_box = gtk_hbox_new (FALSE, 0);
+		tmp_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-		tmp = gtk_hbox_new (FALSE, 0);
+		tmp = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 		tmp1 = gtk_image_new_from_icon_name (
 			"mail-send", GTK_ICON_SIZE_BUTTON);
 		gtk_box_pack_start ((GtkBox *) tmp, tmp1, FALSE, FALSE, 0);
@@ -340,7 +340,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 		gtk_button_set_relief ((GtkButton *) send_widget, GTK_RELIEF_NORMAL);
 		path = "/main-toolbar/pre-main-toolbar/save-draft";
 		send_widget = gtk_ui_manager_get_widget (ui_manager, path);
-		tmp = gtk_hbox_new (FALSE, 0);
+		tmp = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 		tmp1 = gtk_image_new_from_stock (
 			GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON);
 		gtk_box_pack_start ((GtkBox *) tmp, tmp1, FALSE, FALSE, 0);
@@ -366,7 +366,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 	container = e_attachment_paned_get_content_area (
 		E_ATTACHMENT_PANED (priv->attachment_paned));
 
-	widget = gtk_vpaned_new ();
+	widget = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
diff --git a/configure.ac b/configure.ac
index 1268e89193..71dc0d94c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ dnl these settings should match our minimum requirements and we will clean
 dnl up any new deprecation warnings after bumping our minimum requirements.
 dnl But if the warnings get to be overwhelming, use fixed versions instead.
 AM_CPPFLAGS="$AM_CPPFLAGS -DGLIB_VERSION_MIN_REQUIRED=glib_encoded_version"
-AM_CPPFLAGS="$AM_CPPFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_0"
+AM_CPPFLAGS="$AM_CPPFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2"
 AM_CPPFLAGS="$AM_CPPFLAGS -DSOUP_VERSION_MIN_REQUIRED=soup_encoded_version"
 
 AC_SUBST(AM_CPPFLAGS)
diff --git a/e-util/e-activity-bar.c b/e-util/e-activity-bar.c
index f85b403bd7..b90996bd9b 100644
--- a/e-util/e-activity-bar.c
+++ b/e-util/e-activity-bar.c
@@ -265,7 +265,7 @@ e_activity_bar_init (EActivityBar *bar)
 
 	container = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar));
 
-	widget = gtk_hbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
diff --git a/e-util/e-activity-proxy.c b/e-util/e-activity-proxy.c
index 7547088aac..43c77a522f 100644
--- a/e-util/e-activity-proxy.c
+++ b/e-util/e-activity-proxy.c
@@ -273,7 +273,7 @@ e_activity_proxy_init (EActivityProxy *proxy)
 
 	container = GTK_WIDGET (proxy);
 
-	widget = gtk_hbox_new (FALSE, 3);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
diff --git a/e-util/e-alert-bar.c b/e-util/e-alert-bar.c
index 2022af99f1..c19fa74a47 100644
--- a/e-util/e-alert-bar.c
+++ b/e-util/e-alert-bar.c
@@ -264,7 +264,7 @@ alert_bar_constructed (GObject *object)
 	priv->image = widget;
 	gtk_widget_show (widget);
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 75650902ae..8a75101997 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -206,7 +206,7 @@ alert_dialog_constructed (GObject *object)
 		actions = g_list_next (actions);
 	}
 
-	widget = gtk_hbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 	gtk_box_pack_start (GTK_BOX (content_area), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
@@ -218,7 +218,7 @@ alert_dialog_constructed (GObject *object)
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	dialog->priv->content_area = widget;
 	gtk_widget_show (widget);
diff --git a/e-util/e-attachment-bar.c b/e-util/e-attachment-bar.c
index 3fc4753055..56b1a50331 100644
--- a/e-util/e-attachment-bar.c
+++ b/e-util/e-attachment-bar.c
@@ -572,7 +572,7 @@ e_attachment_bar_init (EAttachmentBar *bar)
 
 	container = GTK_WIDGET (bar);
 
-	widget = gtk_vbox_new (FALSE, 0);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	bar->priv->vbox = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -615,7 +615,7 @@ e_attachment_bar_init (EAttachmentBar *bar)
 
 	container = GTK_WIDGET (bar);
 
-	widget = gtk_hbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -666,7 +666,7 @@ e_attachment_bar_init (EAttachmentBar *bar)
 
 	container = bar->priv->expander;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_size_group_add_widget (size_group, widget);
 	gtk_expander_set_label_widget (GTK_EXPANDER (container), widget);
 	gtk_widget_show (widget);
diff --git a/e-util/e-attachment-paned.c b/e-util/e-attachment-paned.c
index a3c4efb187..618ddf9e1d 100644
--- a/e-util/e-attachment-paned.c
+++ b/e-util/e-attachment-paned.c
@@ -666,14 +666,14 @@ e_attachment_paned_init (EAttachmentPaned *paned)
 
 	container = GTK_WIDGET (paned);
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE);
 	paned->priv->content_area = g_object_ref (widget);
 	gtk_widget_show (widget);
 
 	container = widget;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	paned->priv->controls_container = widget;
 	gtk_widget_show (widget);
@@ -709,7 +709,7 @@ e_attachment_paned_init (EAttachmentPaned *paned)
 
 	container = paned->priv->expander;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_size_group_add_widget (size_group, widget);
 	gtk_expander_set_label_widget (GTK_EXPANDER (container), widget);
 	gtk_widget_show (widget);
@@ -727,7 +727,7 @@ e_attachment_paned_init (EAttachmentPaned *paned)
 
 	container = widget;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
diff --git a/e-util/e-cell-date-edit.c b/e-util/e-cell-date-edit.c
index 4f35fbb266..8b43bc9745 100644
--- a/e-util/e-cell-date-edit.c
+++ b/e-util/e-cell-date-edit.c
@@ -229,11 +229,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
 	gtk_widget_show (frame);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
 	gtk_widget_show (vbox);
 
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);
 
@@ -245,7 +245,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	gtk_box_pack_start (GTK_BOX (hbox), ecde->calendar, TRUE, TRUE, 0);
 	gtk_widget_show (ecde->calendar);
 
-	vbox2 = gtk_vbox_new (FALSE, 2);
+	vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
 	gtk_widget_show (vbox2);
 
@@ -290,7 +290,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 		gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), "changed",
 		G_CALLBACK (e_cell_date_edit_on_time_selected), ecde);
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
 	gtk_box_set_spacing (GTK_BOX (bbox), 2);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 88ec69a68d..265b48bf7b 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -462,7 +462,7 @@ ec_rebuild (EConfig *emp)
 			} else if (wn->widget == NULL) {
 				w = gtk_label_new_with_mnemonic (translated_label);
 				gtk_widget_show (w);
-				page = gtk_vbox_new (FALSE, 12);
+				page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 				gtk_container_set_border_width ((GtkContainer *) page, 12);
 				gtk_widget_show (page);
 				gtk_notebook_insert_page ((GtkNotebook *) book, page, w, pageno);
@@ -559,7 +559,7 @@ ec_rebuild (EConfig *emp)
 				}
 
 				if (item->type == E_CONFIG_SECTION)
-					section = gtk_vbox_new (FALSE, 6);
+					section = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 				else {
 					section = gtk_table_new (1, 1, FALSE);
 					gtk_table_set_col_spacings ((GtkTable *) section, 6);
@@ -1169,7 +1169,7 @@ ech_config_section_factory (EConfig *config,
 
 	switch (item->type) {
 		case E_CONFIG_SECTION:
-			widget = gtk_vbox_new (FALSE, 6);
+			widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 			break;
 
 		case E_CONFIG_SECTION_TABLE:
diff --git a/e-util/e-dateedit.c b/e-util/e-dateedit.c
index ab6085f44b..ab569bebb0 100644
--- a/e-util/e-dateedit.c
+++ b/e-util/e-dateedit.c
@@ -672,7 +672,7 @@ create_children (EDateEdit *dedit)
 	gtk_container_add (GTK_CONTAINER (priv->cal_popup), frame);
 	gtk_widget_show (frame);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
 	gtk_widget_show (vbox);
 
@@ -691,7 +691,7 @@ create_children (EDateEdit *dedit)
 	gtk_box_pack_start (GTK_BOX (vbox), priv->calendar, FALSE, FALSE, 0);
 	gtk_widget_show (priv->calendar);
 
-	bbox = gtk_hbutton_box_new ();
+	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
 	gtk_box_set_spacing (GTK_BOX (bbox), 2);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
diff --git a/e-util/e-filter-part.c b/e-util/e-filter-part.c
index c9e14e30c6..775b7a300a 100644
--- a/e-util/e-filter-part.c
+++ b/e-util/e-filter-part.c
@@ -336,7 +336,7 @@ e_filter_part_get_widget (EFilterPart *part)
 
 	g_return_val_if_fail (E_IS_FILTER_PART (part), NULL);
 
-	hbox = gtk_hbox_new (FALSE, 3);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 
 	for (link = part->elements; link != NULL; link = g_list_next (link)) {
 		EFilterElement *element = link->data;
diff --git a/e-util/e-filter-rule.c b/e-util/e-filter-rule.c
index 111073bbad..8dc9a17a8a 100644
--- a/e-util/e-filter-rule.c
+++ b/e-util/e-filter-rule.c
@@ -141,7 +141,7 @@ get_rule_part_widget (ERuleContext *context,
 	data->context = context;
 	data->part = newpart;
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	/* only set to automatically clean up the memory */
 	g_object_set_data_full ((GObject *) hbox, "data", data, g_free);
 
diff --git a/e-util/e-import-assistant.c b/e-util/e-import-assistant.c
index ae48e5c217..32ebe958da 100644
--- a/e-util/e-import-assistant.c
+++ b/e-util/e-import-assistant.c
@@ -247,7 +247,7 @@ import_assistant_file_page_init (EImportAssistant *import_assistant)
 	const gchar *text;
 	gint row = 0;
 
-	page = gtk_vbox_new (FALSE, 6);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_widget_show (page);
 
@@ -331,7 +331,7 @@ import_assistant_destination_page_init (EImportAssistant *import_assistant)
 	GtkWidget *widget;
 	const gchar *text;
 
-	page = gtk_vbox_new (FALSE, 6);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_widget_show (page);
 
@@ -356,7 +356,7 @@ import_assistant_type_page_init (EImportAssistant *import_assistant)
 	GtkWidget *widget;
 	const gchar *text;
 
-	page = gtk_vbox_new (FALSE, 6);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_widget_show (page);
 
@@ -394,7 +394,7 @@ import_assistant_selection_page_init (EImportAssistant *import_assistant)
 	GtkWidget *widget;
 	const gchar *text;
 
-	page = gtk_vbox_new (FALSE, 6);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_widget_show (page);
 
@@ -408,7 +408,7 @@ import_assistant_selection_page_init (EImportAssistant *import_assistant)
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
 	gtk_widget_show (widget);
 
-	widget = gtk_hseparator_new ();
+	widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -422,7 +422,7 @@ import_assistant_progress_page_init (EImportAssistant *import_assistant)
 	GtkWidget *container;
 	GtkWidget *widget;
 
-	page = gtk_vbox_new (FALSE, 6);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_widget_show (page);
 
@@ -447,7 +447,7 @@ import_assistant_simple_page_init (EImportAssistant *import_assistant)
 	GtkListStore *store;
 	gint row = 0;
 
-	page = gtk_vbox_new (FALSE, 6);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_widget_show (page);
 
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c
index de5337d923..801a61ffc7 100644
--- a/e-util/e-mail-signature-editor.c
+++ b/e-util/e-mail-signature-editor.c
@@ -516,7 +516,7 @@ mail_signature_editor_constructed (GObject *object)
 
 	container = gtkhtml_editor->vbox;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	/* Position 2 should be between the main and style toolbars. */
diff --git a/e-util/e-mail-signature-manager.c b/e-util/e-mail-signature-manager.c
index 66463336ea..b32e9ddd60 100644
--- a/e-util/e-mail-signature-manager.c
+++ b/e-util/e-mail-signature-manager.c
@@ -274,7 +274,7 @@ mail_signature_manager_constructed (GObject *object)
 
 	container = widget;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -315,7 +315,7 @@ mail_signature_manager_constructed (GObject *object)
 
 	container = hbox;
 
-	widget = gtk_vbutton_box_new ();
+	widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_button_box_set_layout (
 		GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (widget), 6);
diff --git a/e-util/e-mail-signature-script-dialog.c b/e-util/e-mail-signature-script-dialog.c
index 58e8c43157..00110a34d8 100644
--- a/e-util/e-mail-signature-script-dialog.c
+++ b/e-util/e-mail-signature-script-dialog.c
@@ -458,7 +458,7 @@ mail_signature_script_dialog_constructed (GObject *object)
 		0, 1, 3, 4, GTK_FILL, 0, 0, 0);
 	gtk_widget_show (widget);
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_table_attach (
 		GTK_TABLE (container), widget,
 		1, 2, 3, 4, 0, 0, 0, 0);
diff --git a/e-util/e-preferences-window.c b/e-util/e-preferences-window.c
index fbe6c01d21..fda3037cff 100644
--- a/e-util/e-preferences-window.c
+++ b/e-util/e-preferences-window.c
@@ -324,13 +324,13 @@ e_preferences_window_init (EPreferencesWindow *window)
 		window, "delete-event",
 		G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_add (GTK_CONTAINER (window), widget);
 	gtk_widget_show (widget);
 
 	vbox = widget;
 
-	widget = gtk_hbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
@@ -368,7 +368,7 @@ e_preferences_window_init (EPreferencesWindow *window)
 	window->priv->notebook = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	widget = gtk_hbutton_box_new ();
+	widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_button_box_set_layout (
 		GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
diff --git a/e-util/e-search-bar.c b/e-util/e-search-bar.c
index 9ed0c2d1c9..678e2e8d60 100644
--- a/e-util/e-search-bar.c
+++ b/e-util/e-search-bar.c
@@ -513,7 +513,7 @@ e_search_bar_init (ESearchBar *search_bar)
 
 	container = GTK_WIDGET (search_bar);
 
-	widget = gtk_hbox_new (FALSE, 1);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -621,7 +621,7 @@ e_search_bar_init (ESearchBar *search_bar)
 
 	container = GTK_WIDGET (search_bar);
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	search_bar->priv->wrapped_next_box = g_object_ref (widget);
 	gtk_widget_hide (widget);
@@ -643,7 +643,7 @@ e_search_bar_init (ESearchBar *search_bar)
 
 	container = GTK_WIDGET (search_bar);
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	search_bar->priv->wrapped_prev_box = g_object_ref (widget);
 	gtk_widget_hide (widget);
diff --git a/e-util/e-source-config.c b/e-util/e-source-config.c
index 3ffd303804..747cd3b6a7 100644
--- a/e-util/e-source-config.c
+++ b/e-util/e-source-config.c
@@ -194,7 +194,7 @@ source_config_add_candidate (ESourceConfig *config,
 	candidate->scratch_source = g_object_ref (scratch_source);
 
 	/* Do not show the page here. */
-	candidate->page = g_object_ref_sink (gtk_vbox_new (FALSE, 6));
+	candidate->page = g_object_ref_sink (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
 	gtk_box_pack_start (backend_box, candidate->page, FALSE, FALSE, 0);
 
 	g_ptr_array_add (config->priv->candidates, candidate);
@@ -1014,7 +1014,7 @@ e_source_config_init (ESourceConfig *config)
 
 	/* The backend box holds backend-specific options.  Each backend
 	 * gets a child widget.  Only one child widget is visible at once. */
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_box_pack_end (GTK_BOX (config), widget, TRUE, TRUE, 0);
 	config->priv->backend_box = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -1058,7 +1058,7 @@ e_source_config_insert_widget (ESourceConfig *config,
 	else
 		vbox = e_source_config_get_page (config, scratch_source);
 
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
 	g_object_bind_property (
@@ -1282,7 +1282,7 @@ e_source_config_add_refresh_interval (ESourceConfig *config,
 
 	container = widget;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
diff --git a/e-util/e-table-field-chooser.c b/e-util/e-table-field-chooser.c
index c402edb7fe..dd8a171f9d 100644
--- a/e-util/e-table-field-chooser.c
+++ b/e-util/e-table-field-chooser.c
@@ -158,7 +158,7 @@ create_content (GnomeCanvas **canvas)
 
 	g_return_val_if_fail (canvas != NULL, NULL);
 
-	vbox_top = gtk_vbox_new (FALSE, 4);
+	vbox_top = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox_top);
 
 	label1 = gtk_label_new (_("To add a column to your table, drag it into\nthe location in which you want it to appear."));
diff --git a/e-util/test-calendar.c b/e-util/test-calendar.c
index 718c80e639..9d36e9027a 100644
--- a/e-util/test-calendar.c
+++ b/e-util/test-calendar.c
@@ -90,7 +90,7 @@ main (gint argc,
 		target_table, G_N_ELEMENTS (target_table),
 		GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), cal, TRUE, TRUE, 0);
 	gtk_widget_show (vbox);
 
diff --git a/e-util/test-mail-signatures.c b/e-util/test-mail-signatures.c
index 3dc5f0a720..857dbeae02 100644
--- a/e-util/test-mail-signatures.c
+++ b/e-util/test-mail-signatures.c
@@ -123,7 +123,7 @@ main (gint argc,
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -135,7 +135,7 @@ main (gint argc,
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_set_margin_left (widget, 12);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c
index 17815202d7..8acb62d902 100644
--- a/mail/e-mail-account-manager.c
+++ b/mail/e-mail-account-manager.c
@@ -477,7 +477,7 @@ mail_account_manager_constructed (GObject *object)
 
 	container = GTK_WIDGET (manager);
 
-	widget = gtk_vbutton_box_new ();
+	widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_button_box_set_layout (
 		GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (widget), 6);
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 495bf64895..400d97f3b6 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -647,7 +647,7 @@ mail_browser_constructed (GObject *object)
 
 	/* Construct window widgets. */
 
-	widget = gtk_vbox_new (FALSE, 0);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add (GTK_CONTAINER (object), widget);
 	gtk_widget_show (widget);
 
diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c
index ebce5d102a..81264babc6 100644
--- a/mail/e-mail-config-provider-page.c
+++ b/mail/e-mail-config-provider-page.c
@@ -268,7 +268,7 @@ mail_config_provider_page_add_checkspin (EMailConfigProviderPage *page,
 		post += 2;
 	}
 
-	hbox = gtk_hbox_new (FALSE, 3);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 	gtk_widget_set_margin_left (hbox, STANDARD_MARGIN);
 	gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);
@@ -328,7 +328,7 @@ mail_config_provider_page_add_entry (EMailConfigProviderPage *page,
 	backend = e_mail_config_provider_page_get_backend (page);
 	settings = e_mail_config_service_backend_get_settings (backend);
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_spacing (GTK_BOX (hbox), 6);
 	gtk_widget_set_margin_left (hbox, STANDARD_MARGIN);
 	gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
@@ -387,7 +387,7 @@ mail_config_provider_page_add_options (EMailConfigProviderPage *page,
 	provider = e_mail_config_service_backend_get_provider (backend);
 	settings = e_mail_config_service_backend_get_settings (backend);
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_spacing (GTK_BOX (hbox), 6);
 	gtk_widget_set_margin_left (hbox, STANDARD_MARGIN);
 	gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c
index b7d38a99a9..9dc0296774 100644
--- a/mail/e-mail-label-action.c
+++ b/mail/e-mail-label-action.c
@@ -58,7 +58,7 @@ mail_label_action_menu_item_realize_cb (GtkWidget *menu_item)
 
 	/* Now add our own child widget. */
 
-	widget = gtk_hbox_new (FALSE, 3);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 	gtk_container_add (GTK_CONTAINER (menu_item), widget);
 	gtk_widget_show (widget);
 
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index 839cc75424..5f5b3aa313 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -204,7 +204,7 @@ e_mail_label_dialog_init (EMailLabelDialog *dialog)
 
 	container = content_area;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index 2d09cbc523..c5649de216 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -358,7 +358,7 @@ e_mail_label_manager_init (EMailLabelManager *manager)
 		0, 1, 1, 2, 0, 0, 0, 0);
 	gtk_widget_show (widget);
 
-	widget = gtk_vbutton_box_new ();
+	widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_button_box_set_layout (
 		GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (widget), 6);
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 4ca294fddc..e7920c0c9e 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -199,7 +199,7 @@ create_tab_label (EMailNotebookView *view,
 	GtkWidget *container, *widget;
 	GtkAllocation allocation;
 
-	widget = gtk_hbox_new (FALSE, 0);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_widget_show (widget);
 	container = widget;
 
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index cd0c46b570..595bef8bfe 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -351,7 +351,7 @@ get_rule_part_widget (EMFilterContext *f,
 	data->f = f;
 	data->part = newpart;
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	/* only set to automatically clean up the memory and for less_parts */
 	g_object_set_data_full ((GObject *) hbox, "data", data, g_free);
 
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index e9baf578ec..3779eef5e5 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -395,7 +395,7 @@ em_folder_selection_button_init (EMFolderSelectionButton *emfsb)
 
 	emfsb->priv = EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE (emfsb);
 
-	box = gtk_hbox_new (FALSE, 4);
+	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_add (GTK_CONTAINER (emfsb), box);
 	gtk_widget_show (box);
 
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 8b6878caa4..e64f58d380 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -392,7 +392,7 @@ em_folder_selector_create_new (GtkWindow *parent,
 	folder_tree = em_folder_selector_get_folder_tree (emfs);
 	em_folder_tree_set_excluded (folder_tree, EMFT_EXCLUDE_NOINFERIORS);
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	w = gtk_label_new_with_mnemonic (_("Folder _name:"));
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 6);
 	emfs->name_entry = (GtkEntry *) gtk_entry_new ();
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 69e1271e5f..bb4a74aa39 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -1688,7 +1688,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (editor));
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
@@ -1758,7 +1758,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 
 	container = box;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 8722a8d561..6a20bf4120 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -326,7 +326,7 @@ elm_getwidget (EImport *ei,
 	g_datalist_set_data (
 		&target->data, "elm-do-mail", GINT_TO_POINTER (TRUE));
 
-	box = gtk_vbox_new (FALSE, 2);
+	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 
 	w = gtk_check_button_new_with_label (_("Mail"));
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index ddbc798374..1e8a09460e 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -135,7 +135,7 @@ mbox_getwidget (EImport *ei,
 		select_uri = g_strdup (uri);
 	}
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
 	w = gtk_label_new_with_mnemonic (_("_Destination folder:"));
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6);
@@ -155,7 +155,7 @@ mbox_getwidget (EImport *ei,
 		G_CALLBACK (folder_selected), target);
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6);
 
-	w = gtk_vbox_new (FALSE, 0);
+	w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_pack_start ((GtkBox *) w, hbox, FALSE, FALSE, 0);
 	gtk_widget_show_all (w);
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index eb7e5ade07..4dc6895b04 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -417,7 +417,7 @@ pine_getwidget (EImport *ei,
 		&target->data, "pine-do-addr",
 		GINT_TO_POINTER (TRUE));
 
-	box = gtk_vbox_new (FALSE, 2);
+	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 
 	w = gtk_check_button_new_with_label (_("Mail"));
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index d39ea53382..49aca305df 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -34,7 +34,7 @@ add_section (GtkWidget *container,
 	GtkWidget *widget;
 	gchar *markup;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, expand, expand, 0);
 	gtk_widget_show (widget);
 
@@ -55,7 +55,7 @@ add_section (GtkWidget *container,
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -80,7 +80,7 @@ autocompletion_config_new (EPreferencesWindow *window)
 	registry = e_shell_get_registry (shell);
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	vbox = gtk_vbox_new (FALSE, 12);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_widget_show (vbox);
 
 	itembox = add_section (vbox, _("Date/Time Format"), FALSE);
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index 86cd6f132f..7abcf934fa 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -287,7 +287,7 @@ emfe_audio_inline_get_widget (EMailFormatterExtension *extension,
 	ai_part = (EMailPartAudioInline *) part;
 
 	/* it is OK to call UI functions here, since we are called from UI thread */
-	box = gtk_hbutton_box_new ();
+	box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	ai_part->play_button = g_object_ref (
 		add_button (box, GTK_STOCK_MEDIA_PLAY,
 		G_CALLBACK (play_clicked), part, TRUE));
diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c
index 56fc0f24f6..9506a97aae 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -500,7 +500,7 @@ book_config_ldap_insert_notebook_widget (GtkWidget *vbox,
 	/* This is similar to e_source_config_insert_widget(),
 	 * but instead adds the widget to the LDAP notebook. */
 
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 	gtk_widget_show (hbox);
 
@@ -568,7 +568,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 	/* Page 1 */
 
 	tab_label = _("Connecting to LDAP");
-	page = gtk_vbox_new (FALSE, 12);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_notebook_append_page (notebook, page, NULL);
 	gtk_notebook_set_tab_label_text (notebook, page, tab_label);
@@ -578,7 +578,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	/* Page 1 : Server Information */
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -597,7 +597,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -645,7 +645,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	/* Page 1 : Authentication */
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -664,7 +664,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -703,7 +703,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 	/* Page 2 */
 
 	tab_label = _("Using LDAP");
-	page = gtk_vbox_new (FALSE, 12);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	gtk_notebook_append_page (notebook, page, NULL);
 	gtk_notebook_set_tab_label_text (notebook, page, tab_label);
@@ -713,7 +713,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	/* Page 2 : Searching */
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -732,7 +732,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -795,7 +795,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	/* Page 2 : Downloading */
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -814,13 +814,13 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
 	container = widget;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	book_config_ldap_insert_notebook_widget (
 		container, size_group, _("Limit:"), widget);
 	gtk_widget_show (widget);
diff --git a/modules/cal-config-caldav/e-caldav-chooser-dialog.c b/modules/cal-config-caldav/e-caldav-chooser-dialog.c
index 7cdfe0ad81..1289c9b22f 100644
--- a/modules/cal-config-caldav/e-caldav-chooser-dialog.c
+++ b/modules/cal-config-caldav/e-caldav-chooser-dialog.c
@@ -293,7 +293,7 @@ caldav_chooser_dialog_constructed (GObject *object)
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
@@ -332,7 +332,7 @@ caldav_chooser_dialog_constructed (GObject *object)
 
 	container = gtk_info_bar_get_content_area (GTK_INFO_BAR (widget));
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
diff --git a/modules/cal-config-google/e-google-chooser-dialog.c b/modules/cal-config-google/e-google-chooser-dialog.c
index f3371871d0..9776f6d60c 100644
--- a/modules/cal-config-google/e-google-chooser-dialog.c
+++ b/modules/cal-config-google/e-google-chooser-dialog.c
@@ -204,7 +204,7 @@ google_chooser_dialog_constructed (GObject *object)
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
@@ -243,7 +243,7 @@ google_chooser_dialog_constructed (GObject *object)
 
 	container = gtk_info_bar_get_content_area (GTK_INFO_BAR (widget));
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 66ea4a460e..638fa3c72f 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -419,13 +419,13 @@ cal_shell_content_constructed (GObject *object)
 	container = priv->vpaned;
 
 	if (!e_shell_get_express_mode (shell)) {
-		widget = gtk_vbox_new (FALSE, 0);
+		widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 		gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
 		gtk_widget_show (widget);
 
 		container = widget;
 
-		widget = gtk_hseparator_new ();
+		widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 		gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
 		gtk_widget_show (widget);
 
@@ -462,7 +462,7 @@ cal_shell_content_constructed (GObject *object)
 
 		container = priv->vpaned;
 
-		widget = gtk_vbox_new (FALSE, 0);
+		widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 		gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
 		gtk_widget_show (widget);
 
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 7555950cd1..3a870257e7 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -709,7 +709,7 @@ cal_shell_sidebar_constructed (GObject *object)
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
 	gtk_widget_show (widget);
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index f3523c9d8b..8c66a68ed7 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -328,7 +328,7 @@ action_calendar_purge_cb (GtkAction *action,
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, FALSE, 6);
 	gtk_widget_show (widget);
 
diff --git a/modules/itip-formatter/plugin/config-ui.c b/modules/itip-formatter/plugin/config-ui.c
index 9ba6f05b0e..36a09ff141 100644
--- a/modules/itip-formatter/plugin/config-ui.c
+++ b/modules/itip-formatter/plugin/config-ui.c
@@ -77,13 +77,13 @@ itip_formatter_page_factory (EPlugin *ep,
 	registry = e_shell_get_registry (shell);
 
 	/* Create a new notebook page */
-	page = gtk_vbox_new (FALSE, 0);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	tab_label = gtk_label_new (_("Meeting Invitations"));
 	gtk_notebook_append_page (GTK_NOTEBOOK (hook_data->parent), page, tab_label);
 
 	/* Frame */
-	frame = gtk_vbox_new (FALSE, 6);
+	frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
 
 	/* "General" */
@@ -95,11 +95,11 @@ itip_formatter_page_factory (EPlugin *ep,
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (frame), hbox, FALSE, TRUE, 0);
 	padding_label = gtk_label_new ("");
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
-	inner_vbox = gtk_vbox_new (FALSE, 6);
+	inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Delete message after acting */
@@ -115,7 +115,7 @@ itip_formatter_page_factory (EPlugin *ep,
 	g_object_unref (settings);
 
 	/* "Conflict searching" */
-	frame = gtk_vbox_new (FALSE, 6);
+	frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 24);
 
 	frame_label = gtk_label_new ("");
@@ -126,11 +126,11 @@ itip_formatter_page_factory (EPlugin *ep,
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (frame), hbox, TRUE, TRUE, 0);
 	padding_label = gtk_label_new ("");
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
-	inner_vbox = gtk_vbox_new (FALSE, 6);
+	inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, TRUE, TRUE, 0);
 
 	/* Source selector */
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index d31d27e45e..b141c35560 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -125,7 +125,7 @@ mailto_handler_prompt (EMailtoHandler *extension)
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	widget = gtk_hbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
@@ -137,7 +137,7 @@ mailto_handler_prompt (EMailtoHandler *extension)
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 759b3fdd86..6c24ee6981 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -261,7 +261,7 @@ action_plugin_manager_cb (GtkAction *action,
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 400);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
 	gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
@@ -288,8 +288,8 @@ action_plugin_manager_cb (GtkAction *action,
 		notebook, "switch-page",
 		G_CALLBACK (eppm_switch_page_cb), NULL);
 
-	overview_page = gtk_vbox_new (FALSE, 0);
-	configure_page = gtk_vbox_new (FALSE, 0);
+	overview_page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	configure_page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	g_object_ref_sink (configure_page);
 	gtk_container_set_border_width (GTK_CONTAINER (overview_page), 12);
 	gtk_container_set_border_width (GTK_CONTAINER (configure_page), 12);
@@ -389,7 +389,7 @@ action_plugin_manager_cb (GtkAction *action,
 	gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
 
 	/* this is plugin's name label */
-	subvbox = gtk_vbox_new (FALSE, 6);
+	subvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	m->items[0] = g_object_new (
 		GTK_TYPE_LABEL,
 		"wrap", TRUE,
@@ -406,7 +406,7 @@ action_plugin_manager_cb (GtkAction *action,
 	for (i = 1; i < LABEL_LAST; i++) {
 		gchar *markup;
 
-		subvbox = gtk_vbox_new (FALSE, 6);
+		subvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
 		markup = g_markup_printf_escaped (
 			"<span weight=\"bold\">%s:</span>",
diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.c b/modules/startup-wizard/e-mail-config-import-progress-page.c
index 12a1a7b04e..9ed9e46478 100644
--- a/modules/startup-wizard/e-mail-config-import-progress-page.c
+++ b/modules/startup-wizard/e-mail-config-import-progress-page.c
@@ -213,7 +213,7 @@ mail_config_import_progress_page_constructed (GObject *object)
 		NULL,
 		NULL, (GDestroyNotify) NULL);
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_size_group_add_widget (size_group, widget);
 	gtk_box_pack_start (GTK_BOX (page), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
@@ -247,7 +247,7 @@ mail_config_import_progress_page_constructed (GObject *object)
 
 	container = page->priv->cancelled_msg;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -264,7 +264,7 @@ mail_config_import_progress_page_constructed (GObject *object)
 
 	container = page->priv->completed_msg;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index e005fbdfdf..52a03231b7 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -525,11 +525,11 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin)
 
 	UIData *ui = g_new0 (UIData, 1);
 
-	reminder_configuration_box = gtk_vbox_new (FALSE, 6);
+	reminder_configuration_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show (reminder_configuration_box);
 	gtk_widget_set_size_request (reminder_configuration_box, 385, 189);
 
-	clue_container = gtk_hbox_new (FALSE, 12);
+	clue_container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_widget_show (clue_container);
 	gtk_box_pack_start (
 		GTK_BOX (reminder_configuration_box),
@@ -547,7 +547,7 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin)
 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), clue_treeview);
 	gtk_container_set_border_width (GTK_CONTAINER (clue_treeview), 1);
 
-	vbuttonbox2 = gtk_vbutton_box_new ();
+	vbuttonbox2 = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_widget_show (vbuttonbox2);
 	gtk_box_pack_start (GTK_BOX (clue_container), vbuttonbox2, FALSE, TRUE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox2), GTK_BUTTONBOX_START);
@@ -628,7 +628,7 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin)
 
 	/* Add the list here */
 
-	hbox = gtk_vbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
 	gtk_box_pack_start (GTK_BOX (hbox), reminder_configuration_box, TRUE, TRUE, 0);
 
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 26d1e48d27..7187f6e376 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -650,13 +650,13 @@ bbdb_page_factory (EPlugin *ep,
 	stuff->target = target;
 
 	/* Create a new notebook page */
-	page = gtk_vbox_new (FALSE, 0);
+	page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 	tab_label = gtk_label_new (_("Automatic Contacts"));
 	gtk_notebook_append_page (GTK_NOTEBOOK (hook_data->parent), page, tab_label);
 
 	/* Frame */
-	frame = gtk_vbox_new (FALSE, 6);
+	frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
 
 	/* "Automatic Contacts" */
@@ -668,11 +668,11 @@ bbdb_page_factory (EPlugin *ep,
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (frame), hbox, FALSE, TRUE, 0);
 	padding_label = gtk_label_new ("");
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
-	inner_vbox = gtk_vbox_new (FALSE, 6);
+	inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable BBDB checkbox */
@@ -697,7 +697,7 @@ bbdb_page_factory (EPlugin *ep,
 	stuff->combo_box = combo_box;
 
 	/* "Instant Messaging Contacts" */
-	frame = gtk_vbox_new (FALSE, 6);
+	frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 24);
 
 	frame_label = gtk_label_new ("");
@@ -708,11 +708,11 @@ bbdb_page_factory (EPlugin *ep,
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
 	/* Indent/padding */
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (frame), hbox, FALSE, TRUE, 0);
 	padding_label = gtk_label_new ("");
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
-	inner_vbox = gtk_vbox_new (FALSE, 6);
+	inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable Gaim Checkbox */
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index 0eb5f4f94c..c2fe26d5cd 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -245,7 +245,7 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei,
 		select_uri = g_strdup (local_inbox_uri);
 	}
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
 	w = gtk_label_new_with_mnemonic (_("_Destination folder:"));
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6);
@@ -266,7 +266,7 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei,
 		G_CALLBACK (folder_selected), target);
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6);
 
-	w = gtk_vbox_new (FALSE, 0);
+	w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_pack_start ((GtkBox *) w, hbox, FALSE, FALSE, 0);
 	gtk_widget_show_all (w);
 
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 25f1feff63..ba6f1779b7 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -793,10 +793,10 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	GtkWidget *header_edit;
 	GtkWidget *header_remove;
 
-	ech_configuration_box = gtk_vbox_new (FALSE, 6);
+	ech_configuration_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show (ech_configuration_box);
 
-	vbox2 = gtk_vbox_new (FALSE, 0);
+	vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (ech_configuration_box), vbox2, FALSE, FALSE, 0);
 
@@ -807,11 +807,11 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_CENTER);
 	gtk_label_set_line_wrap (GTK_LABEL (label1), TRUE);
 
-	header_configuration_box = gtk_vbox_new (FALSE, 6);
+	header_configuration_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show (header_configuration_box);
 	gtk_box_pack_start (GTK_BOX (ech_configuration_box), header_configuration_box, TRUE, TRUE, 0);
 
-	header_container = gtk_hbox_new (FALSE, 12);
+	header_container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_widget_show (header_container);
 	gtk_box_pack_start (GTK_BOX (header_configuration_box), header_container, TRUE, TRUE, 0);
 
@@ -825,7 +825,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), header_treeview);
 	gtk_container_set_border_width (GTK_CONTAINER (header_treeview), 1);
 
-	vbuttonbox1 = gtk_vbutton_box_new ();
+	vbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_widget_show (vbuttonbox1);
 	gtk_box_pack_start (GTK_BOX (header_container), vbuttonbox1, FALSE, TRUE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox1), GTK_BUTTONBOX_START);
@@ -933,7 +933,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 
 	/* Add the list here */
 
-	hbox = gtk_vbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
 	gtk_box_pack_start (GTK_BOX (hbox), ech_configuration_box, TRUE, TRUE, 0);
 
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 19a8159e56..2d3d2e00e0 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -107,7 +107,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	gchar *editor;
 	gboolean checked;
 
-	vbox = gtk_vbox_new (FALSE, 10);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
 	textbox = gtk_entry_new ();
 	label = gtk_label_new (_("Command to be executed to launch the editor: "));
 	help = gtk_label_new (_("For XEmacs use \"xemacs\"\nFor Vim use \"gvim -f\""));
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 45d3d2ada9..06a6bc675b 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -353,7 +353,7 @@ get_cfg_widget (void)
 	GtkWidget *vbox, *check, *img, *butt;
 	GdkPixbuf *face;
 
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
 	check = gtk_check_button_new_with_mnemonic (_("_Insert Face picture by default"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), get_include_face_by_default ());
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index bbfc685e11..2c2c701d3b 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -655,7 +655,7 @@ get_config_widget_sound (void)
 
 	scw = g_malloc0 (sizeof (struct _SoundConfigureWidgets));
 
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show (vbox);
 
 	container = vbox;
@@ -686,7 +686,7 @@ get_config_widget_sound (void)
 
 	container = widget;
 
-	widget = gtk_vbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
@@ -718,7 +718,7 @@ get_config_widget_sound (void)
 
 	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
@@ -784,7 +784,7 @@ get_cfg_widget (void)
 
 	settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification");
 
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_widget_show (widget);
 
 	container = widget;
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index e4213fd324..baba27918c 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -159,7 +159,7 @@ prompt_user (gboolean has_subfolders)
 	gtk_widget_show (widget);
 
 	/* Action Area */
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_set_halign (widget, GTK_ALIGN_END);
 	gtk_grid_attach (GTK_GRID (grid), widget, 1, 2, 1, 1);
 	gtk_widget_show (widget);
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index eced3ba259..e20d09a958 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -545,10 +545,10 @@ org_credativ_evolution_readpst_getwidget (EImport *ei,
 
 	pst_import_check_items (target);
 
-	framebox = gtk_vbox_new (FALSE, 2);
+	framebox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 
 	/* Mail */
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	check = gtk_check_button_new_with_mnemonic (_("_Mail"));
 	gtk_toggle_button_set_active ((GtkToggleButton *) check, GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-mail")));
 	g_signal_connect (
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index e5b2be3b70..872530af16 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -560,7 +560,7 @@ create_options_widget (FormatHandler *handler)
 	GtkWidget *table = gtk_table_new (4, 2, FALSE), *label = NULL,
 		  *csv_options = gtk_expander_new_with_mnemonic (
 			_("A_dvanced options for the CSV format")),
-		  *vbox = gtk_vbox_new (FALSE, 0);
+		  *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	CsvPluginData *d = handler->data;
 
 	d->delimiter_entry = gtk_entry_new ();
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 8e8ca93507..c713612db8 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -116,8 +116,8 @@ ask_destination_and_save (ESourceSelector *selector,
 {
 	FormatHandler *handler = NULL;
 
-	GtkWidget *extra_widget = gtk_vbox_new (FALSE, 0);
-	GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+	GtkWidget *extra_widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	GtkLabel *label = GTK_LABEL (gtk_label_new_with_mnemonic (_("_Format:")));
 	GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new ());
 	GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 111014badc..7d89ac06bb 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -421,11 +421,11 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 
 	UIData *ui = g_new0 (UIData, 1);
 
-	templates_configuration_box = gtk_vbox_new (FALSE, 6);
+	templates_configuration_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show (templates_configuration_box);
 	gtk_widget_set_size_request (templates_configuration_box, 385, 189);
 
-	clue_container = gtk_hbox_new (FALSE, 12);
+	clue_container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_widget_show (clue_container);
 	gtk_box_pack_start (GTK_BOX (templates_configuration_box), clue_container, TRUE, TRUE, 0);
 
@@ -439,7 +439,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), clue_treeview);
 	gtk_container_set_border_width (GTK_CONTAINER (clue_treeview), 1);
 
-	vbuttonbox2 = gtk_vbutton_box_new ();
+	vbuttonbox2 = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_widget_show (vbuttonbox2);
 	gtk_box_pack_start (GTK_BOX (clue_container), vbuttonbox2, FALSE, TRUE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox2), GTK_BUTTONBOX_START);
@@ -529,7 +529,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 
 	/* Add the list here */
 
-	hbox = gtk_vbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
 	gtk_box_pack_start (GTK_BOX (hbox), templates_configuration_box, TRUE, TRUE, 0);
 
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b75cd8d602..0707008119 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -444,7 +444,7 @@ e_shell_sidebar_init (EShellSidebar *shell_sidebar)
 
 	container = widget;
 
-	widget = gtk_hbox_new (FALSE, 6);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 9a0624ffc8..40a3d639ea 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -398,7 +398,7 @@ e_shell_taskbar_init (EShellTaskbar *shell_taskbar)
 	shell_taskbar->priv->label = g_object_ref (widget);
 	gtk_widget_hide (widget);
 
-	widget = gtk_hbox_new (FALSE, 3);
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 	gtk_box_pack_start (GTK_BOX (shell_taskbar), widget, TRUE, TRUE, 0);
 	shell_taskbar->priv->hbox = g_object_ref (widget);
 	gtk_widget_hide (widget);
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index a0404f9915..6bea8686b9 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -289,7 +289,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 
 	/* Construct window widgets. */
 
-	widget = gtk_vbox_new (FALSE, 0);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add (GTK_CONTAINER (shell_window), widget);
 	gtk_widget_show (widget);
 
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 3e9be0f845..e3f383ed11 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -422,7 +422,7 @@ shell_window_construct_menubar (EShellWindow *shell_window)
 		parent = gtk_widget_get_parent (main_menu);
 		g_object_ref (parent);
 		gtk_container_remove ((GtkContainer *) parent, main_menu);
-		child = gtk_hbox_new (FALSE, 0);
+		child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 		gtk_box_pack_start ((GtkBox *) child, main_menu, TRUE, TRUE, 0);
 		gtk_widget_show (child);
 		gtk_container_add ((GtkContainer *) parent, child);
@@ -462,7 +462,7 @@ shell_window_construct_toolbar (EShellWindow *shell_window)
 	shell = e_shell_window_get_shell (shell_window);
 	ui_manager = e_shell_window_get_ui_manager (shell_window);
 
-	box = gtk_hbox_new (FALSE, 0);
+	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_widget_show (box);
 
 	g_object_bind_property (
@@ -573,7 +573,7 @@ shell_window_construct_content (EShellWindow *shell_window)
 	GtkWidget *box;
 	GtkWidget *widget;
 
-	box = gtk_vbox_new (FALSE, 0);
+	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (box);
 
 	widget = e_alert_bar_new ();
@@ -607,7 +607,7 @@ shell_window_construct_taskbar (EShellWindow *shell_window)
 
 	shell = e_shell_window_get_shell (shell_window);
 
-	status_area = gtk_hbox_new (FALSE, 3);
+	status_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 	gtk_container_set_border_width (GTK_CONTAINER (status_area), 3);
 
 	g_object_bind_property (
diff --git a/shell/main.c b/shell/main.c
index 302d1a1752..bd7997a3f7 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -172,7 +172,7 @@ show_development_warning (void)
 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
 	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
-	vbox = gtk_vbox_new (FALSE, 12);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);