[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-863-ge618ed66c

paul at claws-mail.org paul at claws-mail.org
Wed Nov 27 13:49:54 CET 2019


The branch, gtk3 has been updated
       via  e618ed66ceae5a08e8c07bd509b275f2929289e9 (commit)
      from  719355331d029fa5d1c830147e26dec02fce4a55 (commit)

Summary of changes:
 src/plugins/archive/archiver_gtk.c                 | 20 +++---
 src/plugins/archive/archiver_prefs.c               | 12 ++--
 src/plugins/att_remover/att_remover.c              |  2 +-
 src/plugins/attachwarner/attachwarner_prefs.c      |  6 +-
 src/plugins/bogofilter/bogofilter_gtk.c            | 20 +++---
 src/plugins/bsfilter/bsfilter_gtk.c                | 16 ++---
 src/plugins/clamd/clamav_plugin_gtk.c              | 18 +++---
 src/plugins/dillo/dillo_prefs.c                    |  6 +-
 src/plugins/fancy/fancy_prefs.c                    |  8 +--
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c       |  4 +-
 src/plugins/gdata/cm_gdata_contacts.c              |  2 +-
 src/plugins/gdata/cm_gdata_prefs.c                 |  2 +-
 src/plugins/libravatar/libravatar_prefs.c          | 14 ++--
 src/plugins/litehtml_viewer/lh_prefs.c             |  6 +-
 src/plugins/litehtml_viewer/lh_viewer.c            |  2 +-
 src/plugins/managesieve/sieve_editor.c             |  4 +-
 src/plugins/managesieve/sieve_manager.c            | 10 +--
 src/plugins/managesieve/sieve_prefs.c              | 16 ++---
 src/plugins/notification/notification_banner.c     |  4 +-
 .../notification/notification_foldercheck.c        |  2 +-
 src/plugins/notification/notification_popup.c      |  2 +-
 src/plugins/notification/notification_prefs.c      | 74 +++++++++++-----------
 src/plugins/pdf_viewer/poppler_viewer.c            |  4 +-
 src/plugins/pgpcore/passphrase.c                   |  4 +-
 src/plugins/pgpcore/prefs_gpg.c                    | 24 +++----
 src/plugins/pgpcore/select-keys.c                  | 10 +--
 src/plugins/python/python_plugin.c                 |  2 +-
 src/plugins/rssyl/rssyl_feed_props.c               | 24 +++----
 src/plugins/rssyl/rssyl_prefs.c                    | 10 +--
 src/plugins/spam_report/spam_report_prefs.c        |  2 +-
 src/plugins/spamassassin/spamassassin_gtk.c        | 20 +++---
 src/plugins/vcalendar/day-view.c                   | 12 ++--
 src/plugins/vcalendar/month-view.c                 | 12 ++--
 src/plugins/vcalendar/vcal_meeting_gtk.c           | 24 +++----
 src/plugins/vcalendar/vcal_prefs.c                 | 36 +++++------
 src/plugins/vcalendar/vcalendar.c                  |  6 +-
 36 files changed, 220 insertions(+), 220 deletions(-)


- Log -----------------------------------------------------------------
commit e618ed66ceae5a08e8c07bd509b275f2929289e9
Author: paul <paul at claws-mail.org>
Date:   Wed Nov 27 12:49:49 2019 +0000

    replace deprecated gtk_vbox_new() and gtk_hbox_new()

diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index 30d132654..01ded8a34 100644
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -131,11 +131,11 @@ static void create_progress_dialog(struct ArchivePage* page) {
 	content_area = gtk_dialog_get_content_area(GTK_DIALOG(progress->progress_dialog));
 	gtk_container_add(GTK_CONTAINER(content_area), progress->frame);
 
-	progress->vbox1 = gtk_vbox_new (FALSE, 4);
+	progress->vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_container_set_border_width (GTK_CONTAINER (progress->vbox1), 4);
 	gtk_container_add(GTK_CONTAINER(progress->frame), progress->vbox1);
 	
-	progress->hbox1 = gtk_hbox_new(FALSE, 8);
+	progress->hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_container_set_border_width(GTK_CONTAINER(progress->hbox1), 8);
 	gtk_box_pack_start(GTK_BOX(progress->vbox1),
 					progress->hbox1, FALSE, FALSE, 0);
@@ -150,7 +150,7 @@ static void create_progress_dialog(struct ArchivePage* page) {
 	gtk_box_pack_start(GTK_BOX(progress->hbox1),
 					progress->file_label, TRUE, TRUE, 0);
 
-	progress->hbox1 = gtk_hbox_new(FALSE, 8);
+	progress->hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_container_set_border_width(GTK_CONTAINER(progress->hbox1), 8);
 	gtk_box_pack_start(GTK_BOX(progress->vbox1),
 					progress->hbox1, FALSE, FALSE, 0);
@@ -1061,11 +1061,11 @@ void archiver_gtk_show() {
 	content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 	gtk_container_add(GTK_CONTAINER(content_area), frame);
 
-	vbox1 = gtk_vbox_new (FALSE, 4);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), vbox1);
 	
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
 
@@ -1083,7 +1083,7 @@ void archiver_gtk_show() {
 	CLAWS_SET_TIP(folder_select,
 			_("Click this button to select a folder which is to be root of the archive"));
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
 
@@ -1105,7 +1105,7 @@ void archiver_gtk_show() {
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_box_pack_start(GTK_BOX(vbox1), frame, FALSE, FALSE, 0);
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
 
@@ -1234,7 +1234,7 @@ void archiver_gtk_show() {
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_box_pack_start(GTK_BOX(vbox1), frame, FALSE, FALSE, 0);
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
 
@@ -1284,7 +1284,7 @@ void archiver_gtk_show() {
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_box_pack_start(GTK_BOX(vbox1), frame, FALSE, FALSE, 0);
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
 
@@ -1323,7 +1323,7 @@ void archiver_gtk_show() {
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_box_pack_start(GTK_BOX(vbox1), frame, FALSE, FALSE, 0);
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
 
diff --git a/src/plugins/archive/archiver_prefs.c b/src/plugins/archive/archiver_prefs.c
index 826630a7a..00eac4c98 100644
--- a/src/plugins/archive/archiver_prefs.c
+++ b/src/plugins/archive/archiver_prefs.c
@@ -202,15 +202,15 @@ static void create_archiver_prefs_page(PrefsPage * _page,
 	GtkWidget *rename_chkbtn;
         GtkWidget *unlink_chkbtn;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 4);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-  	hbox1 = gtk_hbox_new (FALSE, 8);
+  	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
@@ -237,7 +237,7 @@ static void create_archiver_prefs_page(PrefsPage * _page,
 
 	PACK_FRAME (vbox1, frame, _("Default compression"));
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_widget_show(hbox1);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
@@ -362,7 +362,7 @@ static void create_archiver_prefs_page(PrefsPage * _page,
 
 	PACK_FRAME (vbox1, frame, _("Default format"));
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_widget_show(hbox1);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
@@ -408,7 +408,7 @@ static void create_archiver_prefs_page(PrefsPage * _page,
 
 	PACK_FRAME (vbox1, frame, _("Default miscellaneous options"));
 
-	hbox1 = gtk_hbox_new(FALSE, 4);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_widget_show(hbox1);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
 	gtk_container_add(GTK_CONTAINER(frame), hbox1);
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index 9c2fca429..ddbc28801 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -347,7 +347,7 @@ static void remove_attachments_dialog(AttRemover *attremover)
 	g_signal_connect(G_OBJECT(window), "size_allocate",
 			 G_CALLBACK(size_allocate_cb), NULL);
 
-	vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
 	gtk_container_add(GTK_CONTAINER(window), vbox);
 
 	model = GTK_TREE_MODEL(gtk_list_store_new(N_ATT_REMOVER_COLUMNS,
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index 8da3708d6..36cc86a90 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -77,8 +77,8 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
 	GtkWidget *skip_signature_checkbox;
 	GtkWidget *case_sensitive_checkbox;
 
-	vbox1 = gtk_vbox_new(FALSE, 6);
-	vbox2 = gtk_vbox_new(FALSE, 6);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	
 	label = gtk_label_new(_("One of the following regular expressions is matched (one per line)"));
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
@@ -143,7 +143,7 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
 			_("Exclude lines from the first signature-separator onwards from checking for the regular expressions above"));
 	page->skip_signature = skip_signature_checkbox;
 	
-	vbox = gtk_vbox_new(FALSE, VSPACING);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
 
 	PACK_FRAME (vbox, frame, _("Warn when"));
diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 78b4b1a95..42c9c776b 100644
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -145,15 +145,15 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	GtkWidget *whitelist_ab_folder_combo;
 	GtkWidget *whitelist_ab_select_btn;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 4);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-	hbox_process_emails = gtk_hbox_new(FALSE, 8);
+	hbox_process_emails = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_process_emails);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_process_emails, TRUE, TRUE, 0);
 
@@ -162,7 +162,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(process_emails_checkbtn);
 	gtk_box_pack_start(GTK_BOX(hbox_process_emails), process_emails_checkbtn, TRUE, TRUE, 0);
 
-	hbox_max_size = gtk_hbox_new(FALSE, 8);
+	hbox_max_size = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_max_size);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_max_size, TRUE, TRUE, 0);
 
@@ -182,7 +182,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(max_size_kb_label);
 	gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
-	hbox_save_spam = gtk_hbox_new(FALSE, 8);
+	hbox_save_spam = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_save_spam);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_save_spam, TRUE, TRUE, 0);
 
@@ -200,7 +200,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(spam_handle_combobox);
 	gtk_box_pack_start(GTK_BOX(hbox_save_spam), spam_handle_combobox, FALSE, FALSE, 0);
 
-	GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
+	GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox);
 	gtk_box_pack_start (GTK_BOX (hbox_save_spam), hbox, TRUE, TRUE, 0);
 
@@ -219,7 +219,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	g_signal_connect(G_OBJECT(spam_handle_combobox), "changed",
 			G_CALLBACK(spam_handle_combobox_callback), (gpointer)hbox);
 
-	hbox_save_unsure = gtk_hbox_new(FALSE, 8);
+	hbox_save_unsure = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_save_unsure);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_save_unsure, TRUE, TRUE, 0);
 
@@ -245,7 +245,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	CLAWS_SET_TIP(insert_header_checkbtn,
 			_("Only done for messages in MH folders"));
 
-	hbox_whitelist = gtk_hbox_new(FALSE, 8);
+	hbox_whitelist = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_whitelist);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_whitelist, TRUE, TRUE, 0);
 
@@ -272,7 +272,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(learn_from_whitelist_chkbtn);
 	gtk_box_pack_start (GTK_BOX (vbox2), learn_from_whitelist_chkbtn, TRUE, TRUE, 0);
 
-	hbox_bogopath = gtk_hbox_new(FALSE, 8);
+	hbox_bogopath = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_bogopath);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_bogopath, FALSE, FALSE, 0);
 
@@ -286,7 +286,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 	CLAWS_SET_TIP(bogopath_entry,
 			_("Path to bogofilter executable"));
 
-	hbox_mark_as_read = gtk_hbox_new(FALSE, 8);
+	hbox_mark_as_read = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_mark_as_read);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_mark_as_read, TRUE, TRUE, 0);
 
diff --git a/src/plugins/bsfilter/bsfilter_gtk.c b/src/plugins/bsfilter/bsfilter_gtk.c
index 1da8a4e14..9f29335c1 100644
--- a/src/plugins/bsfilter/bsfilter_gtk.c
+++ b/src/plugins/bsfilter/bsfilter_gtk.c
@@ -127,15 +127,15 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 	GtkWidget *whitelist_ab_folder_combo;
 	GtkWidget *whitelist_ab_select_btn;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 4);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-	hbox_process_emails = gtk_hbox_new(FALSE, 8);
+	hbox_process_emails = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_process_emails);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_process_emails, TRUE, TRUE, 0);
 
@@ -144,7 +144,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(process_emails_checkbtn);
 	gtk_box_pack_start(GTK_BOX(hbox_process_emails), process_emails_checkbtn, TRUE, TRUE, 0);
 
-	hbox_max_size = gtk_hbox_new(FALSE, 8);
+	hbox_max_size = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_max_size);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_max_size, TRUE, TRUE, 0);
 
@@ -164,7 +164,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(max_size_kb_label);
 	gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
-	hbox_save_spam = gtk_hbox_new(FALSE, 8);
+	hbox_save_spam = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_save_spam);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_save_spam, TRUE, TRUE, 0);
 
@@ -184,7 +184,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 	CLAWS_SET_TIP(save_spam_folder_select,
 			_("Click this button to select a folder for storing spam"));
 
-	hbox_whitelist = gtk_hbox_new(FALSE, 8);
+	hbox_whitelist = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_whitelist);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_whitelist, TRUE, TRUE, 0);
 
@@ -211,7 +211,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(learn_from_whitelist_chkbtn);
 	gtk_box_pack_start (GTK_BOX (vbox2), learn_from_whitelist_chkbtn, TRUE, TRUE, 0);
 
-	hbox_bspath = gtk_hbox_new(FALSE, 8);
+	hbox_bspath = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_bspath);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_bspath, FALSE, FALSE, 0);
 
@@ -225,7 +225,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 	CLAWS_SET_TIP(bspath_entry,
 			_("Path to bsfilter executable"));
 
-	hbox_mark_as_read = gtk_hbox_new(FALSE, 8);
+	hbox_mark_as_read = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_mark_as_read);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_mark_as_read, TRUE, TRUE, 0);
 
diff --git a/src/plugins/clamd/clamav_plugin_gtk.c b/src/plugins/clamd/clamav_plugin_gtk.c
index 777dfcc90..764da5f2c 100644
--- a/src/plugins/clamd/clamav_plugin_gtk.c
+++ b/src/plugins/clamd/clamav_plugin_gtk.c
@@ -237,11 +237,11 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 
 	enable_clamav = page->enable_clamav;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 4);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
@@ -250,7 +250,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 
  	SET_TOGGLE_SENSITIVITY (enable_clamav, enable_arc);*/
 
- 	hbox1 = gtk_hbox_new (FALSE, 8);
+ 	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 /*	SET_TOGGLE_SENSITIVITY (enable_arc, hbox1);*/
@@ -274,7 +274,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
   	gtk_box_pack_start (GTK_BOX (hbox1), label2, FALSE, FALSE, 0);
  	SET_TOGGLE_SENSITIVITY (enable_clamav, label2);
 
-  	hbox1 = gtk_hbox_new (FALSE, 8);
+  	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
@@ -299,7 +299,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 			     _("Click this button to select a folder for storing infected mail"));
  	SET_TOGGLE_SENSITIVITY (enable_clamav, save_folder_select);
 
-	hbox1 = gtk_hbox_new (FALSE, 8);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
@@ -311,7 +311,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 			     _("Should configuration be done automatic or manual"));
  	SET_TOGGLE_SENSITIVITY (enable_clamav, setting_type);
 	
-  	hbox_auto1 = gtk_hbox_new (FALSE, 8);
+  	hbox_auto1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox_auto1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_auto1, FALSE, FALSE, 0);
 
@@ -333,7 +333,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 			     _("Click this button to select full path to clamd.conf"));
  	SET_TOGGLE_SENSITIVITY (enable_clamav, config_folder_select);
 
-  	hbox_auto2 = gtk_hbox_new (FALSE, 8);
+  	hbox_auto2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox_auto2);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_auto2, FALSE, FALSE, 0);
 
@@ -353,7 +353,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 			     _("Click this button to check and adjust folder permissions"));
  	SET_TOGGLE_SENSITIVITY (enable_clamav, permission_select);
 
-  	hbox_manual1 = gtk_hbox_new (FALSE, 8);
+  	hbox_manual1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox_manual1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_manual1, FALSE, FALSE, 0);
 
@@ -372,7 +372,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 	gtk_widget_show (blank);
 	gtk_box_pack_start (GTK_BOX (hbox_manual1), blank, TRUE, TRUE, 0);
 
-  	hbox_manual2 = gtk_hbox_new (FALSE, 8);
+  	hbox_manual2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox_manual2);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_manual2, FALSE, FALSE, 0);
 
diff --git a/src/plugins/dillo/dillo_prefs.c b/src/plugins/dillo/dillo_prefs.c
index 4cb5547d6..4ac00a835 100644
--- a/src/plugins/dillo/dillo_prefs.c
+++ b/src/plugins/dillo/dillo_prefs.c
@@ -162,7 +162,7 @@ static void create_dillo_prefs_page(PrefsPage *page,
 	GtkWidget *whitelist_ab_select_btn;
 	GtkWidget *hbox_whitelist, *spacer;
 
-        vbox = gtk_vbox_new(FALSE, 3);
+        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
         gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
         gtk_widget_show(vbox);
         
@@ -182,11 +182,11 @@ static void create_dillo_prefs_page(PrefsPage *page,
 	gtkut_widget_set_small_font_size (label);
 	gtk_widget_show(label);
 
-	hbox_whitelist = gtk_hbox_new(FALSE, 8);
+	hbox_whitelist = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_whitelist);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox_whitelist, FALSE, FALSE, 0);
 	
-	spacer = gtk_hbox_new(FALSE, 0);
+	spacer = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_widget_set_size_request(spacer, 12, -1);
 	gtk_widget_show(spacer);
 	gtk_box_pack_start(GTK_BOX(hbox_whitelist), spacer, FALSE, FALSE, 0);
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 880f495d7..c014ee1ca 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -201,11 +201,11 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *stylesheet_browse_button;
 	GtkWidget *stylesheet_edit_button;
 
-	vbox = gtk_vbox_new(FALSE, 3);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
 	gtk_widget_show(vbox);
 
-	GtkWidget *block = gtk_hbox_new(FALSE, 5);
+	GtkWidget *block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 
 	vbox_proxy = gtkut_get_options_frame(vbox, &frame_proxy, _("Proxy"));
 #ifdef HAVE_LIBSOUP_GNOME
@@ -274,7 +274,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	gtk_box_pack_start(GTK_BOX(vbox), enable_plugins, FALSE, FALSE, 0);
 	gtk_widget_show(enable_plugins);
 
-	GtkWidget *hbox_ext = gtk_hbox_new(FALSE, 8);
+	GtkWidget *hbox_ext = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	GtkWidget *open_external_label = gtk_label_new(_("When clicking on a link, by default"));
 	GtkWidget *optmenu_open_external = gtkut_sc_combobox_create(NULL, FALSE);
 	GtkListStore *menu = GTK_LIST_STORE(gtk_combo_box_get_model(
@@ -293,7 +293,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	combobox_select_by_data(GTK_COMBO_BOX(optmenu_open_external),
 			fancy_prefs.open_external);
 	
-	GtkWidget *hbox_css = gtk_hbox_new(FALSE, 8);
+	GtkWidget *hbox_css = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_css);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox_css, FALSE, FALSE, 0);
 
diff --git a/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c b/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
index b102732ce..c4c31e1f2 100644
--- a/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
+++ b/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
@@ -84,7 +84,7 @@ static void fetchinfo_create_widget_func(PrefsPage * _page, GtkWindow *window, g
   	GtkWidget *fetchinfo_userid;
   	GtkWidget *fetchinfo_time;
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
 	gtk_widget_show(vbox);
 
@@ -95,7 +95,7 @@ static void fetchinfo_create_widget_func(PrefsPage * _page, GtkWindow *window, g
 
 	PACK_FRAME (vbox, frame, _("Headers to be added"))
 
-	hdr_vbox = gtk_vbox_new(FALSE, 0);
+	hdr_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show(hdr_vbox);
 	gtk_container_add(GTK_CONTAINER(frame), hdr_vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(hdr_vbox), 8);
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index 7f9ac7b54..3aaa6fbec 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -170,7 +170,7 @@ gchar* ask_user_for_auth_code(const gchar *auth_uri)
   auth_code_query_data->entry = entry;
   g_signal_connect(G_OBJECT(link_button), "clicked", (GCallback)auth_uri_link_button_clicked_cb, (gpointer)auth_code_query_data);
 
-  vbox = gtk_vbox_new(FALSE, 4);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
   gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog))), vbox, FALSE, FALSE, 0);
diff --git a/src/plugins/gdata/cm_gdata_prefs.c b/src/plugins/gdata/cm_gdata_prefs.c
index 85320984d..72b36ca75 100644
--- a/src/plugins/gdata/cm_gdata_prefs.c
+++ b/src/plugins/gdata/cm_gdata_prefs.c
@@ -74,7 +74,7 @@ static void gdata_create_prefs_page(PrefsPage *page, GtkWindow *window, gpointer
   GtkWidget *label;
   GtkWidget *entry;
 
-  vbox = gtk_vbox_new(FALSE, 0);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
   /* auth frame */
   frame = gtk_frame_new(_("Authentication"));
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index baa0b35e7..5372395ca 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -119,7 +119,7 @@ static GtkWidget *labeled_spinner_box(gchar *label, GtkWidget *spinner, gchar *u
 	gtk_widget_show(lbl);
 	lbla = gtk_label_new(units);
 	gtk_widget_show(lbla);
-	hbox = gtk_hbox_new(FALSE, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	if (hint != NULL) {
 		CLAWS_SET_TIP(spinner, hint);
 	}
@@ -208,7 +208,7 @@ static GtkWidget *p_create_frame_cache(struct LibravatarPrefsPage *page)
 	AvatarCacheStats *stats;
 	gchar *markup;
 
-	vbox =  gtk_vbox_new(FALSE, 6);
+	vbox =  gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	checkbox = create_checkbox(_("_Use cached icons"),
 				   _("Keep icons on disk for reusing instead "
@@ -246,7 +246,7 @@ static GtkWidget *p_create_frame_cache(struct LibravatarPrefsPage *page)
 		G_CALLBACK(cache_clean_button_clicked_cb), label);
 	gtk_widget_set_sensitive(button, (stats != NULL && stats->bytes > 0));
 
-	hbox = gtk_hbox_new(FALSE, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_show(hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -319,7 +319,7 @@ static GtkWidget *p_create_frame_missing(struct LibravatarPrefsPage *page)
 		_("Redirect to a user provided URL")
 	};
 
-	vbox =  gtk_vbox_new(FALSE, 6);
+	vbox =  gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	for (i = 0; i < NUM_DEF_BUTTONS; ++i) {
 		enable = (libravatarprefs.default_mode == radio_value[i])? TRUE: FALSE;
@@ -338,7 +338,7 @@ static GtkWidget *p_create_frame_missing(struct LibravatarPrefsPage *page)
 			gtk_widget_show(entry);
 			gtk_entry_set_text(GTK_ENTRY(entry),
 				libravatarprefs.default_mode_url);
-			hbox = gtk_hbox_new(FALSE, 6);
+			hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 			gtk_box_pack_start(GTK_BOX(hbox), radio[i], FALSE, FALSE, 0);
 			gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 			gtk_widget_set_sensitive(entry,
@@ -378,7 +378,7 @@ static GtkWidget *p_create_frame_network(struct LibravatarPrefsPage *page)
 	GtkWidget *chk_federated;
 #endif
 
-	vbox =  gtk_vbox_new(FALSE, 6);
+	vbox =  gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	chk_redirects = create_checkbox(_("_Allow redirects to other sites"),
 				   _("Follow redirect responses received from "
@@ -450,7 +450,7 @@ static void libravatar_prefs_create_widget_func(PrefsPage * _page,
 	vbox2 = p_create_frame_missing(page);
 	vbox3 = p_create_frame_network(page);
 
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
 
 	PACK_FRAME (vbox, frame, _("Icon cache"));
diff --git a/src/plugins/litehtml_viewer/lh_prefs.c b/src/plugins/litehtml_viewer/lh_prefs.c
index cf66401a7..e8af14110 100644
--- a/src/plugins/litehtml_viewer/lh_prefs.c
+++ b/src/plugins/litehtml_viewer/lh_prefs.c
@@ -106,7 +106,7 @@ static void create_lh_prefs_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *default_font;
 	GtkAdjustment *adj;
 
-	vbox = gtk_vbox_new(FALSE, 3);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
 	gtk_widget_show(vbox);
 
@@ -128,7 +128,7 @@ static void create_lh_prefs_page(PrefsPage *page, GtkWindow *window,
 	gtk_widget_show_all(vbox_remote);
 
 	/* Image cache size */
-	hbox = gtk_hbox_new(FALSE, 8);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new(_("Size of image cache in megabytes"));
@@ -143,7 +143,7 @@ static void create_lh_prefs_page(PrefsPage *page, GtkWindow *window,
 	gtk_box_pack_start(GTK_BOX(hbox), image_cache_size, FALSE, FALSE, 0);
 
 	/* Font */
-	hbox = gtk_hbox_new(FALSE, 8);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new(_("Default font"));
diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index 7fee13e47..3ea63a79f 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -183,7 +183,7 @@ MimeViewer *lh_viewer_create()
 	viewer->mimeviewer.scroll_page = lh_scroll_page;
 	viewer->mimeviewer.scroll_one_line = lh_scroll_one_line;
 
-	viewer->vbox = gtk_vbox_new(FALSE, 0);
+	viewer->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
 	GtkWidget *w = lh_widget_get_widget(viewer->widget);
 	gtk_box_pack_start(GTK_BOX(viewer->vbox), w,
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index aeacbf14e..725cef828 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -542,7 +542,7 @@ SieveEditorPage *sieve_editor_new(SieveSession *session, gchar *script_name)
 	g_signal_connect(G_OBJECT(window), "delete_event",
 			 G_CALLBACK(sieve_editor_delete_cb), page);
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add(GTK_CONTAINER(window), vbox);
 
 	ui_manager = gtk_ui_manager_new();
@@ -615,7 +615,7 @@ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Filter", "Revert", "Filter/Revert", GT
 		}
 	}
 
-	hbox = gtk_hbox_new (FALSE, 8);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
 
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index d954087af..4241ce922 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -683,10 +683,10 @@ static SieveManagerPage *sieve_manager_page_new()
 	gtk_window_set_type_hint(GTK_WINDOW(window),
 			GDK_WINDOW_TYPE_HINT_DIALOG);
 
-	vbox = gtk_vbox_new (FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
-	hbox = gtk_hbox_new (FALSE, 8);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
 	/* Accounts list */
@@ -724,7 +724,7 @@ static SieveManagerPage *sieve_manager_page_new()
 
 	/* Filters list */
 
-	hbox = gtk_hbox_new (FALSE, 8);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
 
@@ -741,11 +741,11 @@ static SieveManagerPage *sieve_manager_page_new()
 
 	/* Buttons */
 
-	vbox_allbuttons = gtk_vbox_new (FALSE, 8);
+	vbox_allbuttons = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox_allbuttons, FALSE, FALSE, 0);
 
 	/* buttons that depend on there being a connection */
-	vbox_buttons = gtk_vbox_new (FALSE, 8);
+	vbox_buttons = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_widget_set_sensitive(vbox_buttons, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox_allbuttons), vbox_buttons, FALSE, FALSE, 0);
 
diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index a398cfc61..73932fe88 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -54,7 +54,7 @@ static PrefParam prefs[] = {
 
 #define PACK_HBOX(hbox, vbox) \
 { \
-	hbox = gtk_hbox_new (FALSE, 5); \
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); \
 	gtk_widget_show (hbox); \
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); \
 }
@@ -140,7 +140,7 @@ static void sieve_prefs_account_create_widget_func(PrefsPage *_page,
 	GtkListStore *menu;
 	GtkTreeIter iter;
 
-	page_vbox = gtk_vbox_new (FALSE, VSPACING);
+	page_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (page_vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (page_vbox), VBOX_BORDER);
 
@@ -148,7 +148,7 @@ static void sieve_prefs_account_create_widget_func(PrefsPage *_page,
 	PACK_CHECK_BUTTON (page_vbox, enable_checkbtn,
 			   _("Enable Sieve"));
 
-	sieve_vbox = gtk_vbox_new (FALSE, VSPACING);
+	sieve_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (sieve_vbox);
 	gtk_box_pack_start (GTK_BOX (page_vbox), sieve_vbox, FALSE, FALSE, 0);
 
@@ -212,23 +212,23 @@ static void sieve_prefs_account_create_widget_func(PrefsPage *_page,
 
 	/* Custom Auth Settings */
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (auth_vbox), hbox, FALSE, FALSE, 0);
 
-	hbox_spc = gtk_hbox_new (FALSE, 0);
+	hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_widget_show (hbox_spc);
 	gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
 	gtk_widget_set_size_request (hbox_spc, 12, -1);
 
-	auth_custom_vbox = gtk_vbox_new (FALSE, VSPACING/2);
+	auth_custom_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING/2);
 	gtk_widget_show (auth_custom_vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (auth_custom_vbox), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), auth_custom_vbox, TRUE, TRUE, 0);
 
 	/* User ID + Password */
 
-	hbox = gtk_hbox_new (FALSE, 8);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (auth_custom_vbox), hbox, FALSE, FALSE, 0);
 
@@ -255,7 +255,7 @@ static void sieve_prefs_account_create_widget_func(PrefsPage *_page,
 
 	/* Authentication method */
 
-	auth_method_hbox = gtk_hbox_new (FALSE, 8);
+	auth_method_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (auth_method_hbox);
 	gtk_box_pack_start (GTK_BOX (auth_vbox), auth_method_hbox, FALSE, FALSE, 0);
 
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
index d3eece7ec..1c76f68b0 100644
--- a/src/plugins/notification/notification_banner.c
+++ b/src/plugins/notification/notification_banner.c
@@ -184,7 +184,7 @@ static void notification_banner_create(GSList *msg_list)
 	}
 
   /* Hbox */
-  hbox = gtk_hbox_new(FALSE, 5);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_container_add(GTK_CONTAINER(viewport),hbox);
 
   /* Entrybox */
@@ -305,7 +305,7 @@ static GtkWidget* create_entrybox(GSList *msg_list)
     banner.entries = NULL;
   }
 
-  entrybox = gtk_hbox_new(FALSE, 5);
+  entrybox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
   if(list_length) {
     GSList *walk;
     gint ii = 0;
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index e825fbc9d..7362d5726 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -490,7 +490,7 @@ static void foldercheck_create_window(SpecificFolderArrayEntry *entry)
   MANAGE_WINDOW_SIGNALS_CONNECT(entry->window);
 
   /* vbox */
-  vbox = gtk_vbox_new(FALSE, 4);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_add(GTK_CONTAINER(entry->window), vbox);
 
   /* scrolled window */
diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
index c6f283dd4..e84a2c764 100644
--- a/src/plugins/notification/notification_popup.c
+++ b/src/plugins/notification/notification_popup.c
@@ -614,7 +614,7 @@ static gboolean notification_popup_create(MsgInfo *msginfo)
   gtk_container_add(GTK_CONTAINER(ppopup->event_box), ppopup->frame);
 
   /* Vbox with labels */
-  ppopup->vbox = gtk_vbox_new(FALSE, 2);
+  ppopup->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_set_border_width(GTK_CONTAINER(ppopup->vbox), 5);
   ppopup->label1 = gtk_label_new(msginfo->from ?
                                  msginfo->from : _("(No From)"));
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index 69f8f1cf1..98f317d71 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -602,14 +602,14 @@ static void notify_create_prefs_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *label;
 
 	/* Page vbox */
-	pvbox = gtk_vbox_new(FALSE, 0);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
 	/* Frame */
 	PACK_FRAME (pvbox, frame, _("Include folder types"))
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 10);
 
 	/* Frame vbox */
-	vbox = gtk_vbox_new(FALSE, 4);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
 
@@ -661,7 +661,7 @@ static void notify_create_prefs_page(PrefsPage *page, GtkWindow *window,
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 10);
 
 	/* Frame vbox */
-	vbox = gtk_vbox_new(FALSE, 4);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
 
@@ -751,11 +751,11 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *slider;
 	GtkWidget *color_sel;
 
-	pvbox = gtk_vbox_new(FALSE, 20);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
 	/* Always / Never / Only when non-empty */
-	hbox = gtk_hbox_new(FALSE, 20);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 20);
 	gtk_box_pack_start(GTK_BOX(pvbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new(_("Show banner"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -776,13 +776,13 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 	banner_page.banner_show = combo;
 
 	/* Container vbox for greying out everything */
-	vbox = gtk_vbox_new(FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
 	gtk_widget_show(vbox);
 	banner_page.banner_cont_enable = vbox;
 
 	/* Banner speed */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new(_("Banner speed"));
@@ -821,7 +821,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 	banner_page.banner_speed = slider;
 
 	/* Maximum number of messages in banner */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	label = gtk_label_new(_("Maximum number of messages"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
@@ -836,7 +836,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 	banner_page.banner_max_msgs = spinner;
 
 	/* banner width */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	label = gtk_label_new(_("Banner width"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
@@ -870,7 +870,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 	banner_page.banner_sticky = checkbox;
 
 	/* Check box for enabling folder specific selection */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	checkbox = gtk_check_button_new_with_label(_("Only include selected folders"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
@@ -891,7 +891,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 	gtk_widget_show(hbox);
 
 	/* Check box for enabling custom colors */
-	cvbox = gtk_vbox_new(FALSE, 10);
+	cvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_widget_show(cvbox);
 	PACK_FRAME (vbox, cframe, _("Banner colors"))
 	gtk_container_set_border_width(GTK_CONTAINER(cvbox), 5);
@@ -908,7 +908,7 @@ static void notify_create_banner_page(PrefsPage *page, GtkWindow *window,
 
 	/* Color selection dialogs for foreground and background color */
 	/* foreground */
-	chbox = gtk_hbox_new(FALSE, 10);
+	chbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(cvbox), chbox, FALSE, FALSE, 0);
 	gtk_widget_show(chbox);
 
@@ -1032,7 +1032,7 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *color_sel;
 #endif /* !HAVE_LIBNOTIFY */
 
-	pvbox = gtk_vbox_new(FALSE, 20);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
 	/* Enable popup */
@@ -1046,13 +1046,13 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
 	popup_page.popup_show = checkbox;
 
 	/* Container vbox for greying out everything */
-	vbox = gtk_vbox_new(FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
 	gtk_widget_show(vbox);
 	popup_page.popup_cont_enable = vbox;
 
 	/* Popup timeout */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	label = gtk_label_new(_("Popup timeout"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
@@ -1070,7 +1070,7 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
 	popup_page.popup_timeout = spinner;
 
 	/* Check box for enabling folder specific selection */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	checkbox = gtk_check_button_new_with_label(_("Only include selected folders"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
@@ -1100,7 +1100,7 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
 	popup_page.popup_sticky = checkbox;
 
 	/* Button to set size and position of popup window */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	button = gtk_button_new_with_label(_("Set popup window width and position"));
 	g_signal_connect(G_OBJECT(button), "clicked",
@@ -1153,7 +1153,7 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
 	notify_popup_color_sel_set_sensitivity
 	(GTK_TOGGLE_BUTTON(popup_page.popup_enable_colors), NULL);
 #else /* HAVE_LIBNOTIFY */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	checkbox = gtk_check_button_new_with_label(_("Display folder name"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
@@ -1303,7 +1303,7 @@ static void notify_create_command_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *button, *buttonb;
 	gdouble timeout;
 
-	pvbox = gtk_vbox_new(FALSE, 20);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
 	/* Enable command */
@@ -1317,13 +1317,13 @@ static void notify_create_command_page(PrefsPage *page, GtkWindow *window,
 	command_page.command_enabled = checkbox;
 
 	/* Container vbox for greying out everything */
-	vbox = gtk_vbox_new(FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
 	gtk_widget_show(vbox);
 	command_page.command_cont_enable = vbox;
 
 	/* entry field for command to execute */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	label = gtk_label_new(_("Command to execute"));
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -1341,7 +1341,7 @@ static void notify_create_command_page(PrefsPage *page, GtkWindow *window,
 	command_page.command_line = entry;
 
 	/* Spin button for command timeout */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	label = gtk_label_new(_("Block command after execution for"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
@@ -1359,7 +1359,7 @@ static void notify_create_command_page(PrefsPage *page, GtkWindow *window,
 	command_page.command_timeout = spinner;
 
 	/* Check box for enabling folder specific selection */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	checkbox = gtk_check_button_new_with_label(_("Only include selected folders"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
@@ -1445,7 +1445,7 @@ static void notify_create_lcdproc_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *checkbox;
 	GtkWidget *hbox;
 
-	pvbox = gtk_vbox_new(FALSE, 20);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
 	/* Enable lcdproc */
@@ -1459,13 +1459,13 @@ static void notify_create_lcdproc_page(PrefsPage *page, GtkWindow *window,
 	lcdproc_page.lcdproc_enabled = checkbox;
 
 	/* Container vbox for greying out everything */
-	vbox = gtk_vbox_new(FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
 	gtk_widget_show(vbox);
 	lcdproc_page.lcdproc_cont_enable = vbox;
 
 	/* Hostname and port information */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 	label = gtk_label_new(_("Hostname:Port of LCDd server"));
@@ -1549,7 +1549,7 @@ static void notify_create_trayicon_page(PrefsPage *page, GtkWindow *window,
 	gdouble timeout;
 #endif
 
-	pvbox = gtk_vbox_new(FALSE, 20);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
 	/* Enable trayicon */
@@ -1563,7 +1563,7 @@ static void notify_create_trayicon_page(PrefsPage *page, GtkWindow *window,
 	trayicon_page.trayicon_enabled = checkbox;
 
 	/* Container vbox for greying out everything */
-	vbox = gtk_vbox_new(FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
 	gtk_widget_show(vbox);
 	trayicon_page.trayicon_cont_enable = vbox;
@@ -1593,7 +1593,7 @@ static void notify_create_trayicon_page(PrefsPage *page, GtkWindow *window,
 	trayicon_page.trayicon_hide_when_iconified = checkbox;
 
 	/* folder specific */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 	checkbox = gtk_check_button_new_with_label(_("Only include selected folders"));
@@ -1625,7 +1625,7 @@ static void notify_create_trayicon_page(PrefsPage *page, GtkWindow *window,
 	PACK_FRAME (vbox, frame, _("Passive toaster popup"))
 
 	/* vbox for frame */
-	svbox = gtk_vbox_new(FALSE, 10);
+	svbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_container_set_border_width(GTK_CONTAINER(svbox), 5);
 	gtk_container_add(GTK_CONTAINER(frame), svbox);
 	gtk_widget_show(svbox);
@@ -1642,13 +1642,13 @@ static void notify_create_trayicon_page(PrefsPage *page, GtkWindow *window,
 	trayicon_page.trayicon_popup_enabled = checkbox;
 
 	/* vbox for trayicon popup stuff enabled/disabled container */
-	ssvbox = gtk_vbox_new(FALSE, 10);
+	ssvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(svbox), ssvbox, FALSE, FALSE, 0);
 	gtk_widget_show(ssvbox);
 	trayicon_page.trayicon_popup_cont_enable = ssvbox;
 
 	/* timeout */
-	hbox = gtk_hbox_new(FALSE, 10);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 	label = gtk_label_new(_("Popup timeout"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
@@ -1782,7 +1782,7 @@ static void notify_create_indicator_page(PrefsPage *page, GtkWindow *window,
 	GtkWidget *checkbox;
 	GtkWidget *ind_reg;
 
-	pvbox = gtk_vbox_new(FALSE, 20);
+	pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 	gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
 	/* Enable indicator */
@@ -1795,7 +1795,7 @@ static void notify_create_indicator_page(PrefsPage *page, GtkWindow *window,
 	indicator_page.indicator_enabled = checkbox;
 
 	/* Container vbox for greying out everything */
-	vbox = gtk_vbox_new(FALSE, 10);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 	gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
 	indicator_page.indicator_cont_enable = vbox;
 
@@ -1849,7 +1849,7 @@ static void notify_create_hotkeys_page(PrefsPage *page, GtkWindow *window, gpoin
     GtkWidget *hbox;
     GtkWidget *entry;
 
-    pvbox = gtk_vbox_new(FALSE, 20);
+    pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
     gtk_container_set_border_width(GTK_CONTAINER(pvbox), 10);
 
     /* Enable hotkeys */
@@ -1861,7 +1861,7 @@ static void notify_create_hotkeys_page(PrefsPage *page, GtkWindow *window, gpoin
     hotkeys_page.hotkeys_enabled = checkbox;
 
     /* Container vbox for greying out everything */
-    vbox = gtk_vbox_new(FALSE, 10);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
     gtk_box_pack_start(GTK_BOX(pvbox), vbox, FALSE, FALSE, 0);
     hotkeys_page.hotkeys_cont_enable = vbox;
 
@@ -1875,7 +1875,7 @@ static void notify_create_hotkeys_page(PrefsPage *page, GtkWindow *window, gpoin
     gtk_box_pack_start(GTK_BOX(hotkeys_page.hotkeys_cont_enable), label, FALSE, FALSE, 0);
 
     /* hbox for entry fields */
-    hbox = gtk_hbox_new(FALSE, 6);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_box_pack_start(GTK_BOX(hotkeys_page.hotkeys_cont_enable), hbox, FALSE, FALSE, 0);
 
     /* toggle mainwindow */
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index a2c2de34c..73efb84d3 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1834,8 +1834,8 @@ static MimeViewer *pdf_viewer_create(void)
 			GTK_CONTAINER(viewer->scrollwin),
 			viewer->pdf_view_ebox);
 
-	viewer->vbox = gtk_vbox_new(FALSE, 4);
-	viewer->hbox = gtk_hbox_new(FALSE, 4);
+	viewer->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+	viewer->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 
     /* treeview */
 	tree_store = gtk_tree_store_new(N_INDEX_COLUMNS,
diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 3cd1ffa2e..bcbaed6cc 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -95,7 +95,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
     MANAGE_WINDOW_SIGNALS_CONNECT(window);
     manage_window_set_transient(GTK_WINDOW(window));
 
-    vbox = gtk_vbox_new(FALSE, 8);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
     gtk_container_add(GTK_CONTAINER(window), vbox);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
 
@@ -105,7 +105,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
 	icon = gtk_image_new_from_icon_name("dialog-password",
         			GTK_ICON_SIZE_DIALOG); 
 
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
 	gtk_widget_show (hbox);
         gtk_box_pack_start (GTK_BOX(hbox), icon, FALSE, FALSE, 0);
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 985f9eaf3..d5019daf0 100644
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -130,11 +130,11 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
 	GtkWidget *frame_passphrase;
 	GtkWidget *gpg_path, *gpg_path_btn;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 0);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
@@ -156,7 +156,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
 
 	SET_TOGGLE_SENSITIVITY_REVERSE(checkbtn_use_gpg_agent, checkbtn_store_passphrase);
 
-	hbox1 = gtk_hbox_new (FALSE, 8);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
@@ -191,14 +191,14 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
 	PACK_CHECK_BUTTON (vbox2, checkbtn_passphrase_grab,
 			_("Grab input while entering a passphrase"));
 
-	vbox2 = gtk_vbox_new (FALSE, 0);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
 	PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_warning,
 			_("Display warning on start-up if GnuPG doesn't work"));
 
-	hbox2 = gtk_hbox_new(FALSE, 6);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	label_gpg_path = gtk_label_new(_("Path to GnuPG executable"));
 	gtk_box_pack_start(GTK_BOX(hbox2), label_gpg_path, FALSE, FALSE, 0);
 	gpg_path = gtk_entry_new();
@@ -351,13 +351,13 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 	GtkWidget *new_key_btn;
 	GtkWidget *new_key_box;
 
-	vbox = gtk_vbox_new(FALSE, VSPACING);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
 	gtk_widget_show(vbox);
 
 	vbox2 = gtkut_get_options_frame(vbox, &frame1, _("Sign key"));
 
-	hbox = gtk_hbox_new (FALSE, 5);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
@@ -368,7 +368,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 	gtk_widget_show(key_default);
 	gtk_box_pack_start(GTK_BOX(hbox), key_default, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 5);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
@@ -379,7 +379,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 	gtk_widget_show(key_by_from);
 	gtk_box_pack_start(GTK_BOX(hbox), key_by_from, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 5);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
@@ -390,7 +390,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 	gtk_widget_show(key_custom);
 	gtk_box_pack_start(GTK_BOX(hbox), key_custom, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 5);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
@@ -426,11 +426,11 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 		break;
 	}
 
-	hbox = gtk_hbox_new (FALSE, 5);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
-	new_key_box = gtk_hbox_new(FALSE, 6);
+	new_key_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_show(new_key_box);
 	gtk_box_pack_start(GTK_BOX(hbox), new_key_box, FALSE, FALSE, 0);
 
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index a8119a715..b8526cfd5 100644
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -414,15 +414,15 @@ create_dialog (struct select_keys_s *sk)
                       G_CALLBACK (key_pressed_cb), sk);
     MANAGE_WINDOW_SIGNALS_CONNECT (window);
 
-    vbox = gtk_vbox_new (FALSE, 8);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
     gtk_container_add (GTK_CONTAINER (window), 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);
     label = gtk_label_new ( "" );
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new (FALSE, 8);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
     gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
 
@@ -484,7 +484,7 @@ create_dialog (struct select_keys_s *sk)
 
     gtk_container_add (GTK_CONTAINER (scrolledwin), view);
 
-    hbox = gtk_hbox_new (FALSE, 8);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
     gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
     /* TRANSLATORS: check that the accelerators in _Select, _Other and
@@ -511,7 +511,7 @@ create_dialog (struct select_keys_s *sk)
     g_signal_connect (G_OBJECT (other_btn), "clicked",
                       G_CALLBACK (other_btn_cb), sk);
 
-    vbox2 = gtk_vbox_new (FALSE, 4);
+    vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
     gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
     sk->window = window;
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index c07181b16..bcdeb5528 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -98,7 +98,7 @@ static void setup_python_console(void)
   gtk_widget_set_size_request(python_console, python_config.console_win_width,
 				  python_config.console_win_height);
 
-  vbox = gtk_vbox_new(FALSE, 0);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add(GTK_CONTAINER(python_console), vbox);
 
   console = parasite_python_shell_new();
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index e9ed1647b..9f919222f 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -362,16 +362,16 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 			ritem->ssl_verify_peer);
 
 	/* === Now pack all the widgets */
-	vbox = gtk_vbox_new(FALSE, 5);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 	gtk_container_add(GTK_CONTAINER(feedprop->window), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(feedprop->window), 10);
 
-	inner_vbox = gtk_vbox_new(FALSE, 7);
+	inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 7);
 	gtk_box_pack_start(GTK_BOX(inner_vbox), feedprop->url, FALSE, FALSE, 0);
 	gtk_entry_set_activates_default(GTK_ENTRY(feedprop->url), TRUE);
 
 	/* Auth combo + user (label + entry) + pass (label + entry) */
-	auth_hbox = gtk_hbox_new(FALSE, 7);
+	auth_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
 	gtk_box_pack_start(GTK_BOX(auth_hbox), feedprop->auth_type, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(feedprop->auth_type), "changed",
 			G_CALLBACK(rssyl_feedprop_auth_type_changed_cb),
@@ -394,14 +394,14 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 7);
 	gtk_container_add(GTK_CONTAINER(frame), inner_vbox);
 
-	inner_vbox = gtk_vbox_new(FALSE, 7);
+	inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 7);
 	/* Fetch comments - checkbutton */
 	g_signal_connect(G_OBJECT(feedprop->fetch_comments), "toggled",
 			G_CALLBACK(rssyl_feedprop_togglebutton_toggled_cb),
 			(gpointer)feedprop);
 	gtk_box_pack_start(GTK_BOX(inner_vbox), feedprop->fetch_comments, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new(FALSE, 7);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
 	/* Fetch comments max age - label */
 	label = gtk_label_new(_("Fetch comments on posts aged less than"));
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
@@ -422,8 +422,8 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 7);
 	gtk_container_add(GTK_CONTAINER(frame), inner_vbox);
 
-	inner_vbox = gtk_vbox_new(FALSE, 7);
-	hbox = gtk_hbox_new(FALSE, 7);
+	inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 7);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
 	/* Write heading - checkbox */
 	gtk_box_pack_start(GTK_BOX(inner_vbox), feedprop->write_heading, FALSE, FALSE, 0);
 	/* Keep old items - checkbutton */
@@ -434,7 +434,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 			G_CALLBACK(rssyl_props_trim_cb), ritem);
 	gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new(FALSE, 7);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
 	/* Silent update - label */
 	silent_update_label = gtk_label_new(_("If an item changes"));
 	gtk_box_pack_start(GTK_BOX(hbox), silent_update_label, FALSE, FALSE, 0);
@@ -445,14 +445,14 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 7);
 	gtk_container_add(GTK_CONTAINER(frame), inner_vbox);
 
-	inner_vbox = gtk_vbox_new(FALSE, 7);
+	inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 7);
 	/* Use default refresh interval - checkbutton */
 	gtk_box_pack_start(GTK_BOX(inner_vbox), feedprop->default_refresh_interval, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(feedprop->default_refresh_interval), "toggled",
 			G_CALLBACK(rssyl_feedprop_togglebutton_toggled_cb),
 			(gpointer)feedprop);
 
-	hbox = gtk_hbox_new(FALSE, 7);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
 	/* Refresh interval - label */
 	label = gtk_label_new(_("Refresh interval"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -486,7 +486,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	cancel_align = gtk_alignment_new(0.5, 0.5, 0, 0);
 	gtk_container_add(GTK_CONTAINER(cancel_button), cancel_align);
 
-	cancel_hbox = gtk_hbox_new(FALSE, 2);
+	cancel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
 	gtk_container_add(GTK_CONTAINER(cancel_align), cancel_hbox);
 
 	cancel_label = gtk_label_new_with_mnemonic(_("_Cancel"));
@@ -503,7 +503,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	ok_align = gtk_alignment_new(0.5, 0.5, 0, 0);
 	gtk_container_add(GTK_CONTAINER(ok_button), ok_align);
 
-	ok_hbox = gtk_hbox_new(FALSE, 2);
+	ok_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
 	gtk_container_add(GTK_CONTAINER(ok_align), ok_hbox);
 
 	ok_label = gtk_label_new_with_mnemonic(_("_OK"));
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index 7fc4478b0..d8ce93d62 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -133,10 +133,10 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	GtkWidget *cookies_path, *cookies_btn, *cookies_hbox;
 	GtkWidget *ssl_verify_peer;
 
-	vbox1 = gtk_vbox_new(FALSE, 6);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	/* Refresh interval */
-	refresh_hbox = gtk_hbox_new(FALSE, 6);
+	refresh_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	refresh_enabled = gtk_check_button_new_with_label(
 			_("Default refresh interval"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(refresh_enabled),
@@ -163,7 +163,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 			rssyl_prefs.refresh_on_startup);
 	gtk_box_pack_start(GTK_BOX(vbox1), refresh_on_startup, FALSE, FALSE, 0);
 
-	vbox2 = gtk_vbox_new(FALSE, 6);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	/* Whether to verify SSL peer certificate */
 	ssl_verify_peer = gtk_check_button_new_with_label(
@@ -173,7 +173,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	gtk_box_pack_start(GTK_BOX(vbox2), ssl_verify_peer, FALSE, FALSE, 0);
 
 	/* Path to cookies file for libcurl to use */
-	cookies_hbox = gtk_hbox_new(FALSE, 6);
+	cookies_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	label = gtk_label_new(_("Path to cookies file"));
 	gtk_box_pack_start(GTK_BOX(cookies_hbox), label, FALSE, FALSE, 0);
 
@@ -189,7 +189,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 		G_CALLBACK(rssyl_prefs_cookies_browse_cb), cookies_path);
 	gtk_box_pack_start(GTK_BOX(vbox2), cookies_hbox, FALSE, FALSE, 0);
 
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
 
 	PACK_FRAME (vbox, frame, _("Refreshing"));
diff --git a/src/plugins/spam_report/spam_report_prefs.c b/src/plugins/spam_report/spam_report_prefs.c
index 86dd190a3..93b47fbf5 100644
--- a/src/plugins/spam_report/spam_report_prefs.c
+++ b/src/plugins/spam_report/spam_report_prefs.c
@@ -123,7 +123,7 @@ static void create_spamreport_prefs_page(PrefsPage *page,
 	GtkWidget *tmp;
 	int i = 0;
 	
-        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
         gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
  	gtk_widget_show(vbox);
        
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index a71febb15..241580b75 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -263,11 +263,11 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	GtkCellRenderer *renderer;
 	GtkTreeIter iter;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 4);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
@@ -327,7 +327,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	gtk_label_set_justify(GTK_LABEL(spamd_label), GTK_JUSTIFY_RIGHT);
 	gtk_label_set_xalign(GTK_LABEL(spamd_label), 1.0);
 
-	hbox_spamd = gtk_hbox_new(FALSE, 8);
+	hbox_spamd = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_spamd);
 	gtk_table_attach (GTK_TABLE (table_transport), hbox_spamd, 1, 2, 2, 3,
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
@@ -356,7 +356,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_socket_entry, TRUE, TRUE, 0);
 	CLAWS_SET_TIP(spamd_socket_entry, _("Path of Unix socket"));
 
-	hbox_compress = gtk_hbox_new(FALSE, 8);
+	hbox_compress = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_compress);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_compress, TRUE, TRUE, 0);
 
@@ -367,7 +367,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	CLAWS_SET_TIP(compress_checkbtn,
 			_("Enable compression if spamd uses it, otherwise disable it."));
 
-	hbox_max_size = gtk_hbox_new(FALSE, 8);
+	hbox_max_size = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_max_size);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_max_size, TRUE, TRUE, 0);
 
@@ -387,7 +387,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(max_size_kb_label);
 	gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
-	hbox_timeout = gtk_hbox_new(FALSE, 8);
+	hbox_timeout = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_timeout);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_timeout, TRUE, TRUE, 0);
 
@@ -408,7 +408,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(timeout_seconds_label);
 	gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_seconds_label, FALSE, FALSE, 0);
 
-	hbox_process_emails = gtk_hbox_new(FALSE, 8);
+	hbox_process_emails = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_process_emails);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_process_emails, TRUE, TRUE, 0);
 
@@ -417,7 +417,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(process_emails_checkbtn);
 	gtk_box_pack_start(GTK_BOX(hbox_process_emails), process_emails_checkbtn, TRUE, TRUE, 0);
 
-	hbox_save_spam = gtk_hbox_new(FALSE, 8);
+	hbox_save_spam = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_save_spam);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_save_spam, TRUE, TRUE, 0);
 
@@ -437,7 +437,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	CLAWS_SET_TIP(save_spam_folder_select,
 			_("Click this button to select a folder for storing spam"));
 
-	hbox_mark_as_read = gtk_hbox_new(FALSE, 8);
+	hbox_mark_as_read = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_mark_as_read);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_mark_as_read, TRUE, TRUE, 0);
 
@@ -446,7 +446,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	gtk_widget_show(mark_as_read_checkbtn);
 	gtk_box_pack_start(GTK_BOX(hbox_mark_as_read), mark_as_read_checkbtn, TRUE, TRUE, 0);
 
-	hbox_whitelist = gtk_hbox_new(FALSE, 8);
+	hbox_whitelist = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show(hbox_whitelist);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_whitelist, TRUE, TRUE, 0);
 
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
index 3f07f72e8..71abaf022 100644
--- a/src/plugins/vcalendar/day-view.c
+++ b/src/plugins/vcalendar/day-view.c
@@ -406,7 +406,7 @@ static void add_row(day_win *dw, VCalEvent *event, gint days)
     else
         gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &dw->bg2);
     if (dw->element[row][col] == NULL) {
-        hb = gtk_hbox_new(TRUE, 3);
+        hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
         dw->element[row][col] = hb;
     }
     else {
@@ -527,7 +527,7 @@ static void fill_days(day_win *dw, gint days, FolderItem *item, gint first_col_d
     app_data(dw, item);
 
     for (col = 1; col < days+1; col++) {
-        hb = gtk_hbox_new(FALSE, 0);
+        hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
         /* check if we have full day events and put them to header */
         if (dw->header[col]) {
             gtk_box_pack_start(GTK_BOX(hb), dw->header[col], TRUE, TRUE, 0);
@@ -543,7 +543,7 @@ static void fill_days(day_win *dw, gint days, FolderItem *item, gint first_col_d
 
         /* check rows */
         for (row = 0; row < 24; row++) {
-            hb = gtk_hbox_new(FALSE, 0);
+            hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
             if (row == 0)
                 gtk_widget_set_size_request(hb, width, -1);
             if (dw->element[row][col]) {
@@ -583,7 +583,7 @@ static void build_day_view_header(day_win *dw, char *start_date)
     SummaryView *summaryview = NULL;
     int avail_w = 0, avail_d = 0;
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
     label = gtk_label_new(_("Start"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
@@ -746,7 +746,7 @@ static void build_day_view_table(day_win *dw)
             , GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
     gtk_box_pack_start(GTK_BOX(dw->Vbox), dw->scroll_win_h
             , TRUE, TRUE, 0);
-    dw->day_view_vbox = gtk_vbox_new(FALSE, 0);
+    dw->day_view_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add(GTK_CONTAINER(dw->scroll_win_h), dw->day_view_vbox);
     /* row 1= day header buttons 
      * row 2= full day events after the buttons */
@@ -882,7 +882,7 @@ day_win *create_day_win(FolderItem *item, struct tm tmdate)
     dw->startdate.tm_hour = 0;
     dw->startdate.tm_min = 0;
     dw->startdate.tm_sec = 0;
-    dw->Vbox = gtk_vbox_new(FALSE, 0);
+    dw->Vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
     dw->item = item;
     build_day_view_colours(dw);
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
index 933be76df..ea5a7d60c 100644
--- a/src/plugins/vcalendar/month-view.c
+++ b/src/plugins/vcalendar/month-view.c
@@ -424,7 +424,7 @@ static void add_row(month_win *mw, VCalEvent *event, gint days)
     text = g_strdup(event->summary?event->summary : _("Unknown"));
 
     if (mw->element[row][col] == NULL) {
-        hb = gtk_vbox_new(TRUE, 1);
+        hb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
         mw->element[row][col] = hb;
     }
     else {
@@ -629,7 +629,7 @@ static void fill_days(month_win *mw, gint days, FolderItem *item)
 	} else {
 		row = row - weekoffset;
 	}
-        vb = gtk_vbox_new(FALSE, 0);
+        vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_set_size_request(vb, width, height);
 	    if (g_date_get_day(date) == 1)
     	        label = g_strdup_printf("%d %s", g_date_get_day(date),
@@ -664,7 +664,7 @@ static void fill_days(month_win *mw, gint days, FolderItem *item)
 	    if (day == tm_today.tm_mday && t.tm_mon == tm_today.tm_mon && t.tm_year == tm_today.tm_year)
 	    	gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &mw->bg_today);
 
-            hb = gtk_hbox_new(FALSE, 0);
+            hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
             gtk_box_pack_start(GTK_BOX(hb), ev, TRUE, TRUE, 1);
             gtk_box_pack_start(GTK_BOX(vb), hb, TRUE, TRUE, 0);
             if (mw->element[row][col]) {
@@ -683,7 +683,7 @@ static void build_month_view_header(month_win *mw, char *start_date)
 {
     GtkWidget *hbox, *label, *space_label;
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
     label = gtk_label_new(_("Start"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
@@ -847,7 +847,7 @@ static void build_month_view_table(month_win *mw)
             , GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
     gtk_box_pack_start(GTK_BOX(mw->Vbox), mw->scroll_win_h
             , TRUE, TRUE, 0);
-    mw->month_view_vbox = gtk_vbox_new(FALSE, 0);
+    mw->month_view_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add(GTK_CONTAINER(mw->scroll_win_h), mw->month_view_vbox);
     /* row 1= day header buttons 
      * row 2= full day events after the buttons */
@@ -968,7 +968,7 @@ month_win *create_month_win(FolderItem *item, struct tm tmdate)
 
     mw->startdate = tmdate;
 
-    mw->Vbox = gtk_vbox_new(FALSE, 0);
+    mw->Vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
     mw->item = item;
     build_month_view_colours(mw);
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index e0440885f..58b417799 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -119,7 +119,7 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
 	if (do_space) {								\
 		spacer = gtk_label_new("");					\
 		gtk_widget_set_size_request(spacer, 18, 16);				\
-		s_hbox = gtk_hbox_new(FALSE, 6);				\
+		s_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);				\
 		gtk_box_pack_start(GTK_BOX(s_hbox), spacer, FALSE, FALSE, 0);	\
 		gtk_box_pack_start(GTK_BOX(s_hbox), widget, TRUE, TRUE, 0);	\
 	}									\
@@ -158,7 +158,7 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
 	if (do_space) {								\
 		spacer = gtk_label_new("");					\
 		gtk_widget_set_size_request(spacer, 18, 16);				\
-		s_hbox = gtk_hbox_new(FALSE, 6);				\
+		s_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);				\
 		gtk_box_pack_start(GTK_BOX(s_hbox), spacer, FALSE, FALSE, 0);	\
 		gtk_box_pack_start(GTK_BOX(s_hbox), widget, TRUE, TRUE, 0);	\
 	}									\
@@ -286,7 +286,7 @@ static gboolean remove_btn_cb(GtkButton *widget, gpointer data)
 
 VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar *partstat, gchar *cutype, gboolean first)
 {
-	GtkWidget *att_hbox = gtk_hbox_new(FALSE, 6);
+	GtkWidget *att_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	VCalAttendee *attendee 	= g_new0(VCalAttendee, 1);
 
 	attendee->address	= gtk_entry_new();
@@ -1478,9 +1478,9 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
 	gtk_widget_set_size_request(meet->end_time, 120, -1);
 #endif
 	
-	date_hbox = gtk_hbox_new(FALSE, 6);
-	date_vbox = gtk_vbox_new(FALSE, 6);
-	hbox = gtk_hbox_new(FALSE, 6);
+	date_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+	date_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	label = gtk_label_new(g_strconcat("<b>",_("Starts at:"),"</b> ",NULL));
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
@@ -1503,8 +1503,8 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_box_pack_start(GTK_BOX(date_hbox), label, TRUE, TRUE, 0);
 
-	date_vbox = gtk_vbox_new(FALSE, 6);
-	hbox = gtk_hbox_new(FALSE, 6);
+	date_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	label = gtk_label_new(g_strconcat("<b>",_("Ends at:"),"</b> ", NULL));
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
@@ -1519,7 +1519,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
 	gtk_box_pack_start(GTK_BOX(date_vbox), meet->end_c, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(date_hbox), date_vbox, FALSE, FALSE, 0);
 
-	meet->attendees_vbox = gtk_vbox_new(FALSE, 6);
+	meet->attendees_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show_all(meet->attendees_vbox);
 	if (!event) {
 		attendee_add(meet, NULL, NULL, NULL, NULL, TRUE);
@@ -1586,13 +1586,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
 	}
 	gtk_combo_box_set_active(GTK_COMBO_BOX(meet->who), num);
 	
-	save_hbox = gtk_hbox_new(FALSE, 6);
+	save_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start(GTK_BOX(save_hbox), meet->save_btn, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(save_hbox), meet->avail_btn, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(save_hbox), meet->total_avail_evtbox, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(save_hbox), meet->total_avail_msg, FALSE, FALSE, 0);
 	
-	hbox = gtk_hbox_new(FALSE, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start(GTK_BOX(hbox), meet->avail_evtbox, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), meet->who, TRUE, TRUE, 0);
 
@@ -1630,7 +1630,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
 			gtk_label_new_with_mnemonic(_("Time:")));
 	gtk_widget_show (notebook);
 	
-	maemo_vbox0 = gtk_vbox_new(FALSE, 3);
+	maemo_vbox0 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 	gtk_box_pack_start(GTK_BOX(maemo_vbox0), notebook, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(maemo_vbox0), save_hbox, FALSE, FALSE, 0);
 	
diff --git a/src/plugins/vcalendar/vcal_prefs.c b/src/plugins/vcalendar/vcal_prefs.c
index 5f7867188..0cabd6e17 100644
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -287,22 +287,22 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	gchar *export_pass = NULL;
 	gchar *export_freebusy_pass = NULL;
 
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
+	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	vbox2 = gtk_vbox_new (FALSE, 4);
+	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start(GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
 
 /* alert stuff */
 	PACK_FRAME(vbox2, frame_alert, _("Reminders"));
-	vbox3 = gtk_vbox_new (FALSE, 8);
+	vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_widget_show (vbox3);
 	gtk_container_add (GTK_CONTAINER (frame_alert), vbox3);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
-	hbox1 = gtk_hbox_new (FALSE, 8);
+	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox1, TRUE, TRUE, 0);
 
@@ -359,13 +359,13 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 /* calendar export */
 /* export enable + path stuff */
 	PACK_FRAME(vbox2, frame_export, _("Calendar export"));
-	vbox3 = gtk_vbox_new (FALSE, 8);
+	vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_widget_show (vbox3);
 	gtk_container_add (GTK_CONTAINER (frame_export), vbox3);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
 
 /* export path */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
@@ -384,7 +384,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 			      "(http://server/path/file.ics)"));
 
 /* export auth */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
@@ -406,7 +406,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	gtk_box_pack_start(GTK_BOX (hbox2), export_pass_entry, FALSE, FALSE, 0);
 
 /* export subscriptions too */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
@@ -416,7 +416,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	SET_TOGGLE_SENSITIVITY(export_enable_checkbtn, export_subs_checkbtn);
 
 /* run-command after export stuff */
-	hbox3 = gtk_hbox_new (FALSE, 8);
+	hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox3);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox3, TRUE, TRUE, 0);
 
@@ -446,7 +446,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	gtk_entry_set_text(GTK_ENTRY(export_command_entry), 
 			vcalprefs.export_command);
 
-	hbox3 = gtk_hbox_new (FALSE, 8);
+	hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox3);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox3, TRUE, TRUE, 0);
 	register_orage_checkbtn = gtk_check_button_new_with_label(_("Register Claws' calendar in XFCE's Orage clock"));
@@ -461,7 +461,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	gtk_widget_show (register_orage_checkbtn);
 	gtk_box_pack_start(GTK_BOX (hbox3), register_orage_checkbtn, TRUE, TRUE, 0);
 
-	hbox3 = gtk_hbox_new (FALSE, 8);
+	hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox3);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox3, TRUE, TRUE, 0);
 	calendar_server_checkbtn = gtk_check_button_new_with_label(_("Export as GNOME shell calendar server"));
@@ -477,13 +477,13 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 /* freebusy export */
 /* export enable + path stuff */
 	PACK_FRAME(vbox2, frame_freebusy_export, _("Free/Busy information"));
-	vbox3 = gtk_vbox_new (FALSE, 8);
+	vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_widget_show (vbox3);
 	gtk_container_add (GTK_CONTAINER (frame_freebusy_export), vbox3);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
 
 /* export */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
@@ -503,7 +503,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 			      "(http://server/path/file.ifb)"));
 
 /* auth */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
@@ -525,7 +525,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	gtk_box_pack_start(GTK_BOX (hbox2), export_freebusy_pass_entry, FALSE, FALSE, 0);
 
 /* run-command after export stuff */
-	hbox3 = gtk_hbox_new (FALSE, 8);
+	hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox3);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox3, TRUE, TRUE, 0);
 
@@ -551,7 +551,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 		vcalprefs.freebusy_get_url = g_strdup("");
 
 /* free/busy import */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
@@ -579,13 +579,13 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 
 /* SSL frame */
 	PACK_FRAME(vbox2, frame_ssl_options, _("SSL/TLS options"));
-	vbox3 = gtk_vbox_new (FALSE, 8);
+	vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_widget_show (vbox3);
 	gtk_container_add (GTK_CONTAINER (frame_ssl_options), vbox3);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
 
 /* SSL peer verification */
-	hbox2 = gtk_hbox_new (FALSE, 8);
+	hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index 626a3179e..5e7fce81d 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1187,7 +1187,7 @@ MimeViewer *vcal_viewer_create(void)
 	vcalviewer->reedit = gtk_button_new_with_label(_("Edit meeting..."));
 	vcalviewer->cancel = gtk_button_new_with_label(_("Cancel meeting..."));
 	vcalviewer->uribtn = gtk_button_new_with_label(_("Launch website"));
-	vcalviewer->unavail_box = gtk_hbox_new(FALSE, 6);
+	vcalviewer->unavail_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	warning_img = gtk_image_new_from_icon_name
                         ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
 	warning_label = gtk_label_new(_("You are already busy at this time."));
@@ -1195,14 +1195,14 @@ MimeViewer *vcal_viewer_create(void)
 	gtk_box_pack_start(GTK_BOX(vcalviewer->unavail_box), warning_img, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vcalviewer->unavail_box), warning_label, FALSE, FALSE, 0);
 	
-	hbox = gtk_hbox_new(FALSE, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start(GTK_BOX(hbox), vcalviewer->answer, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), vcalviewer->button, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), vcalviewer->reedit, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), vcalviewer->cancel, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), vcalviewer->uribtn, FALSE, FALSE, 0);
 	
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), vcalviewer->unavail_box, FALSE, FALSE, 0);
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list