[balsa/gtk3] Gtk{HV}Box is deprecated



commit 184adb041bc422395ad9c0f635b55e388d27d803
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Oct 13 17:51:53 2011 -0400

    Gtk{HV}Box is deprecated
    
    	* libbalsa/address.c (libbalsa_address_get_edit_widget):
    	* libbalsa/html.c (libbalsa_html_new):
    	* libbalsa/identity.c (append_ident_notebook_page),
    	(ident_dialog_add_boxes), (libbalsa_identity_config_dialog):
    	* libbalsa/rfc3156.c (select_key_from_list), (get_passphrase_real):
    	* libbalsa/smtp-server.c (libbalsa_smtp_server_dialog):
    	* libbalsa/source-viewer.c (libbalsa_show_message_source):
    	* libinit_balsa/assistant_page_defclient.c
    	(balsa_druid_page_defclient):
    	* libinit_balsa/assistant_page_directory.c
    	(balsa_druid_page_directory):
    	* libinit_balsa/assistant_page_user.c (balsa_druid_page_user):
    	* src/ab-main.c (bab_get_filter_box), (bab_window_new):
    	* src/ab-window.c (balsa_ab_window_init):
    	* src/balsa-app.c (balsa_stock_button_with_label):
    	* src/balsa-message.c (bm_header_tl_buttons), (bm_find_bar_new),
    	(balsa_message_init):
    	* src/balsa-mime-widget-crypto.c
    	(balsa_mime_widget_signature_widget),
    	(balsa_mime_widget_crypto_frame):
    	* src/balsa-mime-widget-message.c (balsa_mime_widget_new_message),
    	(bmw_message_extbody_url), (bmw_message_extbody_mail),
    	(balsa_mime_widget_new_message_tl), (bm_header_widget_new):
    	* src/balsa-mime-widget-multipart.c
    	(balsa_mime_widget_new_multipart):
    	* src/balsa-mime-widget-vcalendar.c
    	(balsa_mime_widget_new_vcalendar), (balsa_vevent_widget):
    	* src/balsa-mime-widget.c (balsa_mime_widget_new_unknown):
    	* src/filter-edit-callbacks.c (build_type_notebook),
    	(build_condition_dialog):
    	* src/filter-edit-dialog.c (build_left_side), (build_match_page),
    	(build_action_page), (build_right_side), (filters_edit_dialog):
    	* src/filter-run-dialog.c (balsa_filter_run_dialog_init):
    	* src/folder-conf.c (folder_conf_imap_sub_node):
    	* src/mailbox-conf.c (balsa_server_conf_get_advanced_widget):
    	* src/main-window.c:
    	* src/message-window.c (message_window_new):
    	* src/pref-manager.c (open_preferences_manager),
    	(vbox_in_container), (color_box), (remote_mailbox_servers_group),
    	(outgoing_mail_group), (checking_group), (message_colors_group),
    	(add_pref_menu), (misc_group), (deleting_messages_group),
    	(folder_scanning_group), (address_books_group), (pm_page_new),
    	(pm_group_new):
    	* src/print-gtk.c (message_prefs_widget):
    	* src/sendmsg-window.c (sw_get_user_codeset),
    	(quote_parts_select_dlg), (sendmsg_window_new),
    	(subject_not_empty), (check_suggest_encryption):
    	* src/toolbar-prefs.c (customize_dialog_cb),
    	(create_toolbar_page): deprecation cleanup.

 ChangeLog                                |   54 ++++++++++++++++++++++++++++++
 libbalsa/address.c                       |    2 +-
 libbalsa/html.c                          |    2 +-
 libbalsa/identity.c                      |   10 +++---
 libbalsa/rfc3156.c                       |    8 ++--
 libbalsa/smtp-server.c                   |    2 +-
 libbalsa/source-viewer.c                 |    2 +-
 libinit_balsa/assistant_page_defclient.c |    2 +-
 libinit_balsa/assistant_page_directory.c |    2 +-
 libinit_balsa/assistant_page_user.c      |    2 +-
 src/ab-main.c                            |    8 ++--
 src/ab-window.c                          |    7 ++--
 src/balsa-app.c                          |    2 +-
 src/balsa-message.c                      |   12 +++---
 src/balsa-mime-widget-crypto.c           |    6 ++--
 src/balsa-mime-widget-message.c          |   12 +++---
 src/balsa-mime-widget-multipart.c        |    2 +-
 src/balsa-mime-widget-vcalendar.c        |    4 +-
 src/balsa-mime-widget.c                  |    5 ++-
 src/filter-edit-callbacks.c              |    9 +++--
 src/filter-edit-dialog.c                 |   14 ++++---
 src/filter-run-dialog.c                  |    6 ++--
 src/folder-conf.c                        |    2 +-
 src/mailbox-conf.c                       |    2 +-
 src/main-window.c                        |   15 ++++----
 src/message-window.c                     |    2 +-
 src/pref-manager.c                       |   37 ++++++++++----------
 src/print-gtk.c                          |   20 +++++-----
 src/sendmsg-window.c                     |   20 +++++-----
 src/toolbar-prefs.c                      |   15 ++++----
 30 files changed, 174 insertions(+), 112 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 122de28..80980e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
 2011-10-13  Peter Bloomfield
 
+	Gtk{HV}Box is deprecated.
+
+	* libbalsa/address.c (libbalsa_address_get_edit_widget):
+	* libbalsa/html.c (libbalsa_html_new):
+	* libbalsa/identity.c (append_ident_notebook_page),
+	(ident_dialog_add_boxes), (libbalsa_identity_config_dialog):
+	* libbalsa/rfc3156.c (select_key_from_list), (get_passphrase_real):
+	* libbalsa/smtp-server.c (libbalsa_smtp_server_dialog):
+	* libbalsa/source-viewer.c (libbalsa_show_message_source):
+	* libinit_balsa/assistant_page_defclient.c
+	(balsa_druid_page_defclient):
+	* libinit_balsa/assistant_page_directory.c
+	(balsa_druid_page_directory):
+	* libinit_balsa/assistant_page_user.c (balsa_druid_page_user):
+	* src/ab-main.c (bab_get_filter_box), (bab_window_new):
+	* src/ab-window.c (balsa_ab_window_init):
+	* src/balsa-app.c (balsa_stock_button_with_label):
+	* src/balsa-message.c (bm_header_tl_buttons), (bm_find_bar_new),
+	(balsa_message_init):
+	* src/balsa-mime-widget-crypto.c
+	(balsa_mime_widget_signature_widget),
+	(balsa_mime_widget_crypto_frame):
+	* src/balsa-mime-widget-message.c (balsa_mime_widget_new_message),
+	(bmw_message_extbody_url), (bmw_message_extbody_mail),
+	(balsa_mime_widget_new_message_tl), (bm_header_widget_new):
+	* src/balsa-mime-widget-multipart.c
+	(balsa_mime_widget_new_multipart):
+	* src/balsa-mime-widget-vcalendar.c
+	(balsa_mime_widget_new_vcalendar), (balsa_vevent_widget):
+	* src/balsa-mime-widget.c (balsa_mime_widget_new_unknown):
+	* src/filter-edit-callbacks.c (build_type_notebook),
+	(build_condition_dialog):
+	* src/filter-edit-dialog.c (build_left_side), (build_match_page),
+	(build_action_page), (build_right_side), (filters_edit_dialog):
+	* src/filter-run-dialog.c (balsa_filter_run_dialog_init):
+	* src/folder-conf.c (folder_conf_imap_sub_node):
+	* src/mailbox-conf.c (balsa_server_conf_get_advanced_widget):
+	* src/main-window.c:
+	* src/message-window.c (message_window_new):
+	* src/pref-manager.c (open_preferences_manager),
+	(vbox_in_container), (color_box), (remote_mailbox_servers_group),
+	(outgoing_mail_group), (checking_group), (message_colors_group),
+	(add_pref_menu), (misc_group), (deleting_messages_group),
+	(folder_scanning_group), (address_books_group), (pm_page_new),
+	(pm_group_new):
+	* src/print-gtk.c (message_prefs_widget):
+	* src/sendmsg-window.c (sw_get_user_codeset),
+	(quote_parts_select_dlg), (sendmsg_window_new),
+	(subject_not_empty), (check_suggest_encryption):
+	* src/toolbar-prefs.c (customize_dialog_cb),
+	(create_toolbar_page): deprecation cleanup.
+
+2011-10-13  Peter Bloomfield
+
 	* src/sendmsg-window.h: remove redundant member header_table.
 	* src/sendmsg-window.c (create_email_or_string_entry),
 	(create_string_entry), (create_email_entry), (create_from_entry),
diff --git a/libbalsa/address.c b/libbalsa/address.c
index dc4588d..2ecd6ca 100644
--- a/libbalsa/address.c
+++ b/libbalsa/address.c
@@ -971,7 +971,7 @@ libbalsa_address_get_edit_widget(const LibBalsaAddress *address,
 	label = gtk_label_new_with_mnemonic(_(labels[cnt]));
 	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
         if (cnt == EMAIL_ADDRESS) {
-            GtkWidget *box = gtk_vbox_new(FALSE, 0);
+            GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
             GtkWidget *but = gtk_button_new_with_mnemonic(_("A_dd"));
             entries[cnt] = lba_address_list_widget(changed_cb,
                                                    changed_data);
diff --git a/libbalsa/html.c b/libbalsa/html.c
index 0da9f21..40b3d7c 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -384,7 +384,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
     info->frame           = NULL;
     info->download_images = FALSE;
     info->has_info_bar    = FALSE;
-    info->vbox = vbox     = gtk_vbox_new(FALSE, 0);
+    info->vbox = vbox     = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
     widget = webkit_web_view_new();
     gtk_box_pack_end(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index 0de2b05..583dfd2 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -921,7 +921,7 @@ append_ident_notebook_page(GtkNotebook *notebook, guint rows,
     GtkWidget *vbox;
     GtkWidget *grid;
 
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     grid = libbalsa_create_grid();
     gtk_container_set_border_width(GTK_CONTAINER(grid), padding);
     gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 0);
@@ -1365,12 +1365,12 @@ ident_dialog_add_boxes(GtkWidget * grid, gint row, GtkDialog * dialog,
 {
     GtkWidget *hbox, *vbox;
 
-    hbox = gtk_hbox_new(FALSE, 12);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
     gtk_grid_attach(GTK_GRID(grid), hbox, 1, row, 1, 1);
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     g_object_set_data(G_OBJECT(dialog), key1, vbox);
     gtk_container_add(GTK_CONTAINER(hbox), vbox);
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     g_object_set_data(G_OBJECT(dialog), key2, vbox);
     gtk_container_add(GTK_CONTAINER(hbox), vbox);
 }
@@ -1740,7 +1740,7 @@ libbalsa_identity_config_dialog(GtkWindow *parent, GList **identities,
     gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                     IDENTITY_RESPONSE_CLOSE);
 
-    hbox = gtk_hbox_new(FALSE, padding);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
     gtk_box_pack_start(GTK_BOX
                        (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
                        hbox, TRUE, TRUE, 0);
diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
index a56e12c..04eab2b 100644
--- a/libbalsa/rfc3156.c
+++ b/libbalsa/rfc3156.c
@@ -1517,7 +1517,7 @@ select_key_from_list(const gchar * name, gboolean is_secret,
 #if HAVE_MACOSX_DESKTOP
     libbalsa_macosx_menu_for_parent(dialog, parent);
 #endif
-    vbox = gtk_vbox_new(FALSE, 12);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_container_add(GTK_CONTAINER
                       (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
                       vbox);
@@ -1708,13 +1708,13 @@ get_passphrase_real(GMimeGpgmeContext * ctx, const gchar * uid_hint,
 #if HAVE_MACOSX_DESKTOP
     libbalsa_macosx_menu_for_parent(dialog, parent);
 #endif
-    hbox = gtk_hbox_new(FALSE, 12);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
     gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
     gtk_container_add(GTK_CONTAINER
                       (gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
                       hbox);
 
-    vbox = gtk_vbox_new(FALSE, 12);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_container_add(GTK_CONTAINER(hbox), vbox);
     if (!padlock_keyhole)
 	padlock_keyhole =
@@ -1722,7 +1722,7 @@ get_passphrase_real(GMimeGpgmeContext * ctx, const gchar * uid_hint,
     gtk_box_pack_start(GTK_BOX(vbox),
 		       gtk_image_new_from_pixbuf(padlock_keyhole), FALSE,
 		       FALSE, 0);
-    vbox = gtk_vbox_new(FALSE, 12);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_container_add(GTK_CONTAINER(hbox), vbox);
     if (prev_was_bad)
 	prompt =
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 74a5460..e541017 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -611,7 +611,7 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
     sdi->split_button =
         gtk_check_button_new_with_mnemonic(_("Sp_lit message larger than"));
     gtk_grid_attach(GTK_GRID(grid), sdi->split_button, 0, row, 1, 1);
-    hbox = gtk_hbox_new(FALSE, 6);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
     sdi->big_message = gtk_spin_button_new_with_range(0.1, 100, 0.1);
     gtk_box_pack_start(GTK_BOX(hbox), sdi->big_message, TRUE, TRUE, 0);
     label = gtk_label_new(_("MB"));
diff --git a/libbalsa/source-viewer.c b/libbalsa/source-viewer.c
index 228cac4..5d8ad07 100644
--- a/libbalsa/source-viewer.c
+++ b/libbalsa/source-viewer.c
@@ -285,7 +285,7 @@ libbalsa_show_message_source(LibBalsaMessage* msg, const gchar * font,
     g_object_set_data(G_OBJECT(window), "text", text);
     gtk_window_set_wmclass(GTK_WINDOW(window), "message-source", "Balsa");
     gtk_window_set_default_size(GTK_WINDOW(window), *width, *height);
-    vbox = gtk_vbox_new(FALSE, 1);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
     menubar = lbsv_app_set_menus(GTK_WINDOW(window), &escape_action);
     
 #if HAVE_MACOSX_DESKTOP
diff --git a/libinit_balsa/assistant_page_defclient.c b/libinit_balsa/assistant_page_defclient.c
index 1d92578..b2a1a60 100644
--- a/libinit_balsa/assistant_page_defclient.c
+++ b/libinit_balsa/assistant_page_defclient.c
@@ -95,7 +95,7 @@ balsa_druid_page_defclient(GtkAssistant *druid, GdkPixbuf *default_logo)
     }
 
     defclient = g_new0(BalsaDruidPageDefclient, 1);
-    page = gtk_vbox_new(FALSE, FALSE);
+    page = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
     gtk_assistant_append_page(druid, page);
     gtk_assistant_set_page_title(druid, page, _("Default Client"));
     gtk_assistant_set_page_header_image(druid, page, default_logo);
diff --git a/libinit_balsa/assistant_page_directory.c b/libinit_balsa/assistant_page_directory.c
index 4abbf7b..ed13ccb 100644
--- a/libinit_balsa/assistant_page_directory.c
+++ b/libinit_balsa/assistant_page_directory.c
@@ -263,7 +263,7 @@ balsa_druid_page_directory(GtkAssistant * druid, GdkPixbuf * default_logo)
     BalsaDruidPageDirectory *dir;
 
     dir = g_new0(BalsaDruidPageDirectory, 1);
-    dir->page = gtk_vbox_new(FALSE, FALSE);
+    dir->page = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
     gtk_assistant_append_page(druid, dir->page);
     gtk_assistant_set_page_title(druid, dir->page, _("Mail Files"));
     gtk_assistant_set_page_header_image(druid, dir->page, default_logo);
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 578a582..e7bda2a 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -170,7 +170,7 @@ balsa_druid_page_user(GtkAssistant * druid, GdkPixbuf * default_logo)
     BalsaDruidPageUser *user;
 
     user = g_new0(BalsaDruidPageUser, 1);
-    user->page = gtk_vbox_new(FALSE, FALSE);
+    user->page = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
     gtk_assistant_append_page(druid, user->page);
     gtk_assistant_set_page_title(druid, user->page, _("User Settings"));
     gtk_assistant_set_page_header_image(druid, user->page, default_logo);
diff --git a/src/ab-main.c b/src/ab-main.c
index f8c712d..395d9ec 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -937,7 +937,7 @@ bab_filter_entry_changed(GtkWidget *entry, GtkWidget *button)
 static GtkWidget*
 bab_get_filter_box(void)
 {
-    GtkWidget *search_hbox = gtk_hbox_new(FALSE, 1);
+    GtkWidget *search_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
     GtkWidget *find_label, *find_entry, *button;
 
     gtk_widget_show(search_hbox);
@@ -985,7 +985,7 @@ bab_window_new()
     gtk_window_set_title(GTK_WINDOW(wnd), "Contacts");
 
     /* main vbox */
-    main_vbox = gtk_vbox_new(FALSE, 1);
+    main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
     gtk_container_add(GTK_CONTAINER(wnd), main_vbox);
 
     get_main_menu(GTK_WIDGET(wnd), &menubar, contacts_app.address_book_list);
@@ -999,7 +999,7 @@ bab_window_new()
     gtk_box_pack_start(GTK_BOX(main_vbox),
 		       contacts_app.notebook, TRUE, TRUE, 1);
 
-    browse_widget = gtk_vbox_new(FALSE, 1);
+    browse_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
 
     /* Entry widget for finding an address */
     gtk_box_pack_start(GTK_BOX(browse_widget),
@@ -1017,7 +1017,7 @@ bab_window_new()
     gtk_notebook_append_page(GTK_NOTEBOOK(contacts_app.notebook), browse_widget,
 			     gtk_label_new("Browse"));
 
-    edit_widget = gtk_vbox_new(FALSE, 1);
+    edit_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
     contacts_app.edit_widget =
         libbalsa_address_get_edit_widget(NULL, contacts_app.entries,
                                          G_CALLBACK(address_changed_cb),
diff --git a/src/ab-window.c b/src/ab-window.c
index e2f2b8c..8ca0adf 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -288,7 +288,7 @@ balsa_ab_window_init(BalsaAbWindow *ab)
 		     G_CALLBACK(balsa_ab_window_find), ab);
 
     /* Pack the find stuff into the grid */
-    box2 = gtk_hbox_new(FALSE, 1);
+    box2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
     gtk_grid_attach(GTK_GRID(grid), box2, 0, 0, 1, 1);
     gtk_box_pack_start(GTK_BOX(box2), find_label, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(box2), ab->filter_entry, TRUE, TRUE, 0);
@@ -330,7 +330,7 @@ balsa_ab_window_init(BalsaAbWindow *ab)
 
     /* -- grid column 2 -- */
     /* Column for arrows in compose mode */
-    ab->arrow_box = gtk_vbox_new(FALSE, 5);
+    ab->arrow_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
     gtk_widget_set_vexpand(ab->arrow_box, TRUE);
     gtk_grid_attach(GTK_GRID(grid), ab->arrow_box, 1, 1, 1, 1);
     gtk_widget_show(ab->arrow_box);
@@ -388,7 +388,8 @@ balsa_ab_window_init(BalsaAbWindow *ab)
 	    ab->current_address_book->dist_list_mode);
 
     /* Pack them into a box  */
-    box2 = gtk_vbox_new(TRUE, 1);
+    box2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
+    gtk_box_set_homogeneous(GTK_BOX(box2), TRUE);
     gtk_container_add(GTK_CONTAINER(frame), box2);
     gtk_box_pack_start(GTK_BOX(box2), ab->single_address_mode_radio,
 		       FALSE, FALSE, 1);
diff --git a/src/balsa-app.c b/src/balsa-app.c
index 580278b..355a74d 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -571,7 +571,7 @@ balsa_stock_button_with_label(const char *icon, const char *text)
     GtkWidget *button;
     GtkWidget *pixmap = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
     GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0, 0);
-    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
+    GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
     button = gtk_button_new();
     gtk_container_add(GTK_CONTAINER(button), align);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 55ee21b..1bdbf2f 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -275,16 +275,16 @@ bm_header_tl_buttons(BalsaMessage * bm)
 
     ebox = gtk_event_box_new();
 
-    hbox2 = gtk_hbox_new(FALSE, 6);
+    hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_container_set_border_width(GTK_CONTAINER(hbox2), 6);
     gtk_container_add(GTK_CONTAINER(ebox), hbox2);
 
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_box_pack_start(GTK_BOX(hbox2), vbox, FALSE, FALSE, 0);
     g_object_set_data(G_OBJECT(bm), BALSA_MESSAGE_FACE_BOX, vbox);
 
 #ifdef HAVE_GPGME
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_box_pack_start(GTK_BOX(hbox2), vbox, FALSE, FALSE, 0);
 
     button = gtk_button_new();
@@ -305,7 +305,7 @@ bm_header_tl_buttons(BalsaMessage * bm)
 		     G_CALLBACK(message_recheck_crypto_cb), bm);
 #endif
 
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_box_pack_start(GTK_BOX(hbox2), vbox, FALSE, FALSE, 0);
 
     button = gtk_button_new();
@@ -575,7 +575,7 @@ bm_find_bar_new(BalsaMessage * bm)
     toolbar = gtk_toolbar_new();
     gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
 
-    hbox = gtk_hbox_new(FALSE, 6);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("Find:")),
                        FALSE, FALSE, 0);
     bm->find_entry = gtk_entry_new();
@@ -671,7 +671,7 @@ balsa_message_init(BalsaMessage * bm)
     gtk_notebook_set_show_border(GTK_NOTEBOOK(bm), FALSE);
 
     /* Box to hold the scrolled window and the find bar */
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     label = gtk_label_new(_("Content"));
     gtk_notebook_append_page(GTK_NOTEBOOK(bm), vbox, label);
 
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index 6874082..b63a4d5 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -77,7 +77,7 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
 	infostr = labelstr;
     }
     
-    vbox = gtk_vbox_new(FALSE, BMW_VBOX_SPACE);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_VBOX_SPACE);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), BMW_CONTAINER_BORDER);
     label = gtk_label_new(infostr);
     gtk_label_set_selectable(GTK_LABEL(label), TRUE);
@@ -118,9 +118,9 @@ balsa_mime_widget_crypto_frame(LibBalsaMessageBody * mime_body, GtkWidget * chil
     const gchar * icon_name;
 
     frame = gtk_frame_new(NULL);
-    vbox = gtk_vbox_new(FALSE, BMW_VBOX_SPACE);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_VBOX_SPACE);
     gtk_container_add(GTK_CONTAINER(frame), vbox);
-    icon_box = gtk_hbox_new(FALSE, BMW_VBOX_SPACE);
+    icon_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BMW_VBOX_SPACE);
     if (was_encrypted)
 	gtk_box_pack_start(GTK_BOX(icon_box),
 			   gtk_image_new_from_stock(BALSA_PIXMAP_ENCR, GTK_ICON_SIZE_MENU),
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 070d2c6..f05353d 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -126,7 +126,7 @@ balsa_mime_widget_new_message(BalsaMessage * bm,
 
 	mw->widget = gtk_frame_new(NULL);
 
-	mw->container = gtk_vbox_new(FALSE, BMW_MESSAGE_PADDING);
+	mw->container = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_MESSAGE_PADDING);
 	gtk_container_set_border_width(GTK_CONTAINER(mw->container),
 				       BMW_MESSAGE_PADDING);
 	gtk_container_add(GTK_CONTAINER(mw->widget), mw->container);
@@ -215,7 +215,7 @@ bmw_message_extbody_url(LibBalsaMessageBody * mime_body,
     /* now create & return the widget... */
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
     
-    mw->widget = gtk_vbox_new(FALSE, BMW_VBOX_SPACE);
+    mw->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_VBOX_SPACE);
     gtk_container_set_border_width(GTK_CONTAINER(mw->widget),
 				   BMW_CONTAINER_BORDER);
 
@@ -262,7 +262,7 @@ bmw_message_extbody_mail(LibBalsaMessageBody * mime_body)
     /* now create & return the widget... */
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
     
-    mw->widget = gtk_vbox_new(FALSE, BMW_VBOX_SPACE);
+    mw->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_VBOX_SPACE);
     gtk_container_set_border_width(GTK_CONTAINER(mw->widget),
 				   BMW_CONTAINER_BORDER);
 
@@ -379,13 +379,13 @@ balsa_mime_widget_new_message_tl(BalsaMessage * bm, GtkWidget * tl_buttons)
 
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
 
-    mw->widget = gtk_vbox_new(FALSE, BMW_MESSAGE_PADDING);
+    mw->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_MESSAGE_PADDING);
     gtk_container_set_border_width(GTK_CONTAINER(mw->widget), BMW_MESSAGE_PADDING);
 
     mw->header_widget = headers = bm_header_widget_new(bm, tl_buttons);
     gtk_box_pack_start(GTK_BOX(mw->widget), headers, FALSE, FALSE, 0);
 
-    mw->container = gtk_vbox_new(FALSE, BMW_MESSAGE_PADDING);
+    mw->container = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_MESSAGE_PADDING);
     gtk_box_pack_start(GTK_BOX(mw->widget), mw->container, TRUE, TRUE,
 		       BMW_CONTAINER_BORDER - BMW_MESSAGE_PADDING);
 
@@ -506,7 +506,7 @@ bm_header_widget_new(BalsaMessage * bm, GtkWidget * buttons)
     g_signal_connect_after(widget, "style-updated",
 			   G_CALLBACK(bm_header_widget_set_style), bm);
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_container_add(GTK_CONTAINER(widget), hbox);
 
     text_view = gtk_text_view_new();
diff --git a/src/balsa-mime-widget-multipart.c b/src/balsa-mime-widget-multipart.c
index 36d609f..3d65aa4 100644
--- a/src/balsa-mime-widget-multipart.c
+++ b/src/balsa-mime-widget-multipart.c
@@ -41,7 +41,7 @@ balsa_mime_widget_new_multipart(BalsaMessage * bm,
     g_return_val_if_fail(content_type != NULL, NULL);
 
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
-    mw->widget = mw->container = gtk_vbox_new(FALSE, BMW_MESSAGE_PADDING);
+    mw->widget = mw->container = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_MESSAGE_PADDING);
 
 #ifdef HAVE_GPGME
     if (!g_ascii_strcasecmp("multipart/signed", content_type) &&
diff --git a/src/balsa-mime-widget-vcalendar.c b/src/balsa-mime-widget-vcalendar.c
index 93f37fb..d8b0e7e 100644
--- a/src/balsa-mime-widget-vcalendar.c
+++ b/src/balsa-mime-widget-vcalendar.c
@@ -62,7 +62,7 @@ balsa_mime_widget_new_vcalendar(BalsaMessage * bm,
 	return NULL;
 
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
-    mw->widget = gtk_vbox_new(FALSE, 12);
+    mw->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
 
     text = g_strdup_printf(_("This is an iTIP calendar \"%s\" message."),
 			   libbalsa_vcal_method_to_str(vcal_obj->method));
@@ -217,7 +217,7 @@ balsa_vevent_widget(LibBalsaVEvent * event, gboolean may_reply,
     GRID_ATTACH_TEXT(grid, event->description, _("Description:"));
 
     if (sender && vevent_ident) {
-	GtkWidget *box = gtk_vbox_new(FALSE, 6);
+	GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	GtkWidget *label;
 	GtkWidget *bbox;
 	GtkWidget *button;
diff --git a/src/balsa-mime-widget.c b/src/balsa-mime-widget.c
index f1e3835..e29f352 100644
--- a/src/balsa-mime-widget.c
+++ b/src/balsa-mime-widget.c
@@ -229,7 +229,7 @@ balsa_mime_widget_new_unknown(BalsaMessage * bm,
     g_return_val_if_fail(mime_body, NULL);
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
 
-    mw->widget = gtk_vbox_new(FALSE, BMW_VBOX_SPACE);
+    mw->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_VBOX_SPACE);
     gtk_container_set_border_width(GTK_CONTAINER(mw->widget),
 				   BMW_CONTAINER_BORDER);
 
@@ -287,7 +287,8 @@ balsa_mime_widget_new_unknown(BalsaMessage * bm,
     gtk_label_set_ellipsize(GTK_LABEL(msg_label), PANGO_ELLIPSIZE_END);
     gtk_box_pack_start(GTK_BOX(mw->widget), msg_label, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new(TRUE, BMW_HBOX_SPACE);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BMW_HBOX_SPACE);
+    gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
     if ((button = libbalsa_vfs_mime_button(mime_body, use_content_type,
                                            G_CALLBACK(balsa_mime_widget_ctx_menu_cb),
                                            (gpointer) mime_body)))
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index 9251026..8a18a50 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -1006,7 +1006,7 @@ build_type_notebook()
     gtk_grid_set_row_spacing(GTK_GRID(grid), 5);
     gtk_grid_set_column_spacing(GTK_GRID(grid), 5);
 
-    box = gtk_vbox_new(FALSE, 5);
+    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
     g_object_set(box, "margin", 5, NULL);
     gtk_box_pack_start(GTK_BOX(box), grid, TRUE, TRUE, 0);
 
@@ -1031,7 +1031,7 @@ build_type_notebook()
     gtk_notebook_append_page(GTK_NOTEBOOK(fe_type_notebook), box, NULL);
     
     /* The regex page of the type notebook */
-    box = gtk_vbox_new(FALSE, 5);
+    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
     g_object_set(box, "margin", 5, NULL);
 
     gtk_notebook_append_page(GTK_NOTEBOOK(fe_type_notebook), box, NULL);
@@ -1063,7 +1063,8 @@ build_type_notebook()
 
     gtk_container_add(GTK_CONTAINER(scroll), GTK_WIDGET(fe_type_regex_list));
 
-    box = gtk_hbox_new(TRUE, 5);
+    box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+    gtk_box_set_homogeneous(GTK_BOX(box), TRUE);
     gtk_table_attach(GTK_TABLE(page),
                      box,
                      0, 5, 4, 5,
@@ -1174,7 +1175,7 @@ void build_condition_dialog(GtkWidget * condition_dialog)
 
     /* builds the toggle buttons to specify fields concerned by the
      * conditions of the filter */
-    box = gtk_hbox_new(FALSE, 5);
+    box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
     label = gtk_label_new_with_mnemonic(_("Search T_ype:"));
     gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
     fe_search_option_menu = 
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index 84e1f7a..7ba0acb 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -197,7 +197,7 @@ build_left_side(void)
        | -- --  |
        \--------/
      */
-    vbox = gtk_vbox_new(FALSE, 2);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
 
     /* the list */
     sw = gtk_scrolled_window_new(NULL, NULL);
@@ -276,7 +276,7 @@ build_match_page()
     gtk_widget_set_halign(label, GTK_ALIGN_START);
     gtk_grid_attach(GTK_GRID(page), label, 0, 1, 1, 1);
 
-    box = gtk_vbox_new(FALSE, 2);
+    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
     gtk_widget_set_hexpand(box, TRUE);
     gtk_grid_attach(GTK_GRID(page), box, 1, 1, 1, 1);
 
@@ -378,7 +378,8 @@ build_action_page(GtkWindow * window)
     GtkWidget *box;
     GtkWidget *dialog;
 
-    page = gtk_vbox_new(TRUE, 5);
+    page = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+    gtk_box_set_homogeneous(GTK_BOX(page), TRUE);
 
     /* The notification area */
 
@@ -442,7 +443,8 @@ build_action_page(GtkWindow * window)
     gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
     gtk_box_pack_start(GTK_BOX(page), frame, FALSE, FALSE, 0);
 
-    box = gtk_vbox_new(TRUE, 2);
+    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+    gtk_box_set_homogeneous(GTK_BOX(box), TRUE);
     gtk_container_set_border_width(GTK_CONTAINER(frame), 3);
     gtk_container_add(GTK_CONTAINER(frame), box);
 
@@ -481,7 +483,7 @@ build_right_side(GtkWindow * window)
     GtkWidget *notebook, *page;
     GtkWidget *bbox;
 
-    rightside = gtk_vbox_new(FALSE, 5);
+    rightside = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 
     /* the main notebook */
     notebook = gtk_notebook_new();
@@ -589,7 +591,7 @@ filters_edit_dialog(void)
                                       GTK_RESPONSE_OK, FALSE);
 
     /* main hbox */
-    hbox = gtk_hbox_new(FALSE, FILTER_EDIT_PADDING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, FILTER_EDIT_PADDING);
     gtk_box_pack_start(GTK_BOX
                        (gtk_dialog_get_content_area(GTK_DIALOG(fe_window))),
                        hbox, TRUE, TRUE, FILTER_EDIT_PADDING);
diff --git a/src/filter-run-dialog.c b/src/filter-run-dialog.c
index 320b3cb..1d25b64 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -285,12 +285,12 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     g_signal_connect(G_OBJECT(p), "destroy",
                      G_CALLBACK(fr_destroy_window_cb), NULL);
 
-    hbox = gtk_hbox_new(FALSE,2);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2);
 
     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p))),
 		       hbox, TRUE, TRUE, 0);
 
-    vbox = gtk_vbox_new(FALSE, 2);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
     gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
 
     p->available_filters =
@@ -338,7 +338,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
 
     gtk_box_pack_start(GTK_BOX(hbox),bbox, FALSE, FALSE, 6);
 
-    vbox=gtk_vbox_new(FALSE,2);
+    vbox=gtk_box_new(GTK_ORIENTATION_VERTICAL,2);
 
     gtk_box_pack_start(GTK_BOX(hbox),vbox, TRUE, TRUE, 0);
 
diff --git a/src/folder-conf.c b/src/folder-conf.c
index ebb0144..ed66fdc 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -862,7 +862,7 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
     g_signal_connect(G_OBJECT(button), "clicked",
 		     G_CALLBACK(browse_button_cb), (gpointer) sdd);
 
-    hbox = gtk_hbox_new(FALSE, 12);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
     gtk_widget_set_hexpand(hbox, TRUE);
     gtk_box_pack_start(GTK_BOX(hbox), sdd->parent_folder, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 0442a11..c703d36 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -210,7 +210,7 @@ balsa_server_conf_get_advanced_widget(BalsaServerConf *bsc, LibBalsaServer *s,
     GtkWidget *box;
     gboolean use_ssl = s && s->use_ssl;
 
-    box = gtk_vbox_new(FALSE, 0);
+    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
 #if !defined(USE_SSL)
     gtk_box_pack_start(GTK_BOX(box),
diff --git a/src/main-window.c b/src/main-window.c
index ee7413f..4b333c2 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -1239,7 +1239,7 @@ bw_create_index_widget(BalsaWindow *bw)
         view_filters_translated = TRUE;
     }
 
-    bw->sos_bar = gtk_hbox_new(FALSE, 5);
+    bw->sos_bar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 
     bw->filter_choice = gtk_combo_box_text_new();
     gtk_box_pack_start(GTK_BOX(bw->sos_bar), bw->filter_choice,
@@ -1276,7 +1276,7 @@ bw_create_index_widget(BalsaWindow *bw)
     g_signal_connect(G_OBJECT(bw->filter_choice), "changed",
                      G_CALLBACK(bw_filter_entry_changed), button);
     gtk_widget_show_all(button);
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 #if defined(ENABLE_TOUCH_UI)
     /* Usually we want to show the widget unless we operate in
      * space-constrained conditions. */
@@ -1685,7 +1685,7 @@ balsa_window_new()
     balsa_register_pixmaps();
 
     window = g_object_new(BALSA_TYPE_WINDOW, NULL);
-    window->vbox = gtk_vbox_new(FALSE, 0);
+    window->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_show(window->vbox);
     gtk_container_add(GTK_CONTAINER(window), window->vbox);
 
@@ -1735,7 +1735,7 @@ balsa_window_new()
      * need the UIManager. */
     g_object_unref(ui_manager);
 
-    window->bottom_bar = hbox = gtk_hbox_new(FALSE, 6);
+    window->bottom_bar = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_box_pack_end(GTK_BOX(window->vbox), hbox, FALSE, FALSE, 0);
 
     window->progress_bar = gtk_progress_bar_new();
@@ -2288,7 +2288,7 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
     gint w, h;
     GtkCssProvider *css_provider;
 
-    box = gtk_hbox_new(FALSE, 4);
+    box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 
     lab = gtk_label_new(mbnode->mailbox->name);
     bw_notebook_label_style(GTK_LABEL(lab),
@@ -4410,9 +4410,10 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
 	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2);
 
 	/* Reverse and Wrap checkboxes */
-	box = gtk_hbox_new(FALSE, 6);
+	box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add(GTK_CONTAINER(frame), box);
-	w = gtk_vbox_new(TRUE, 2);
+	w = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+        gtk_box_set_homogeneous(GTK_BOX(w), TRUE);
 	gtk_container_set_border_width(GTK_CONTAINER(w), 6);
 	reverse_button =
             gtk_check_button_new_with_mnemonic(_("_Reverse search"));
diff --git a/src/message-window.c b/src/message-window.c
index fa9e02b..338b849 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -552,7 +552,7 @@ message_window_new(LibBalsaMailbox * mailbox, guint msgno)
     mw = g_malloc0(sizeof(MessageWindow));
 
     mw->window = window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    vbox = gtk_vbox_new(FALSE, 0);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add(GTK_CONTAINER(window), vbox);
 
     mw->headers_shown=balsa_app.shown_headers;
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 21016e0..0268a7b 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -511,7 +511,7 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
     libbalsa_macosx_menu_for_parent(property_box, GTK_WINDOW(active_win));
 #endif
 
-    hbox = gtk_hbox_new(FALSE, 12);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
     gtk_container_add(GTK_CONTAINER
                       (gtk_dialog_get_content_area
                        (GTK_DIALOG(property_box))), hbox);
@@ -1560,7 +1560,7 @@ add_button_to_box(const gchar * label, GCallback cb, gpointer cb_data,
 static GtkWidget *
 vbox_in_container(GtkWidget * container)
 {
-    GtkWidget *res = gtk_vbox_new(FALSE, ROW_SPACING);
+    GtkWidget *res = gtk_box_new(GTK_ORIENTATION_VERTICAL, ROW_SPACING);
     gtk_container_add(GTK_CONTAINER(container), res);
     return res;
 }
@@ -1569,7 +1569,7 @@ static GtkWidget *
 color_box(GtkBox * parent, const gchar * title)
 {
     GtkWidget *box, *picker;
-    box = gtk_hbox_new(FALSE, COL_SPACING);
+    box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     gtk_box_pack_start(parent, box, FALSE, FALSE, 0);
 
     picker = gtk_color_button_new();
@@ -1611,7 +1611,7 @@ remote_mailbox_servers_group(GtkWidget * page)
     GtkWidget *server_add_menu;
 
     group = pm_group_new(_("Remote mailbox servers"));
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, TRUE);
 
     scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -1697,7 +1697,7 @@ outgoing_mail_group(GtkWidget * page)
     GtkWidget *vbox;
 
     group = pm_group_new(_("Outgoing mail servers"));
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, TRUE);
 
     scrolled_window = gtk_scrolled_window_new(NULL, NULL);
@@ -1819,7 +1819,7 @@ checking_group(GtkWidget * page)
     gtk_grid_attach(grid, pui->check_imap_inbox, 1, row, 2, 1);
 
     ++row;
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
 
     label = gtk_label_new(_("When mail arrives:"));
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -2269,9 +2269,10 @@ message_colors_group(GtkWidget * page)
     GtkWidget *group;
     GtkWidget *vbox;
     gint i;
-    
+
     group = pm_group_new(_("Message colors"));
-    vbox = gtk_vbox_new(TRUE, HIG_PADDING);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, HIG_PADDING);
+    gtk_box_set_homogeneous(GTK_BOX(vbox), TRUE);
     pm_group_add(group, vbox, FALSE);
 
     for(i = 0; i < MAX_QUOTED_COLOR; i++) {
@@ -2465,7 +2466,7 @@ add_pref_menu(const gchar* label, const gchar *names[], gint size,
 
     omenu = create_pref_option_menu(names, size, index);
 
-    hbox = gtk_hbox_new(FALSE, padding);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
     lbw = gtk_label_new(label);
     gtk_misc_set_alignment(GTK_MISC(lbw), 0, 0.5);
     pm_page_add_to_size_group(page, lbw);
@@ -2537,7 +2538,7 @@ misc_group(GtkWidget * page)
     pui->debug = pm_group_add_check(group, _("Debug"));
     pui->empty_trash = pm_group_add_check(group, _("Empty trash on exit"));
 
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, FALSE);
 
     pui->close_mailbox_auto =
@@ -2598,7 +2599,7 @@ deleting_messages_group(GtkWidget * page)
         pm_group_add_check(group, _("Expunge deleted messages "
 				    "when mailbox is closed"));
 
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, FALSE);
 
     pui->expunge_auto =
@@ -2690,7 +2691,7 @@ folder_scanning_group(GtkWidget * page)
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
     pm_group_add(group, label, FALSE);
 
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, FALSE);
     label = gtk_label_new(_("Scan local folders to depth"));
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -2702,7 +2703,7 @@ folder_scanning_group(GtkWidget * page)
     gtk_box_pack_start(GTK_BOX(hbox), pui->local_scan_depth,
                        TRUE, TRUE, 0);
 
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, FALSE);
     label = gtk_label_new(_("Scan IMAP folders to depth"));
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -2744,7 +2745,7 @@ address_books_group(GtkWidget * page)
     GtkWidget *address_book_add_menu;
 
     group = pm_group_new(_("Address books"));
-    hbox = gtk_hbox_new(FALSE, COL_SPACING);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, COL_SPACING);
     pm_group_add(group, hbox, TRUE);
 
     scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -3465,7 +3466,7 @@ pm_page_new(void)
     GtkWidget *page;
     GtkSizeGroup *size_group;
 
-    page = gtk_vbox_new(FALSE, GROUP_SPACING);
+    page = gtk_box_new(GTK_ORIENTATION_VERTICAL, GROUP_SPACING);
     gtk_container_set_border_width(GTK_CONTAINER(page), BORDER_WIDTH);
 
     size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -3521,7 +3522,7 @@ pm_group_new(const gchar * text)
     GtkWidget *hbox;
     GtkWidget *vbox;
 
-    group = gtk_vbox_new(FALSE, HEADER_SPACING);
+    group = gtk_box_new(GTK_ORIENTATION_VERTICAL, HEADER_SPACING);
 
     label = gtk_label_new(NULL);
     markup = g_strdup_printf("<b>%s</b>", text);
@@ -3531,11 +3532,11 @@ pm_group_new(const gchar * text)
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(group), label, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start(GTK_BOX(group), hbox, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("    "),
                        FALSE, FALSE, 0);
-    vbox = gtk_vbox_new(FALSE, ROW_SPACING);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, ROW_SPACING);
     gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
     g_object_set_data(G_OBJECT(group), BALSA_GROUP_VBOX_KEY, vbox);
 
diff --git a/src/print-gtk.c b/src/print-gtk.c
index 548b58a..4945290 100644
--- a/src/print-gtk.c
+++ b/src/print-gtk.c
@@ -490,10 +490,10 @@ message_prefs_widget(GtkPrintOperation * operation,
 
     gtk_print_operation_set_custom_tab_label(operation, _("Message"));
 
-    page = gtk_vbox_new(FALSE, 18);
+    page = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
     gtk_container_set_border_width(GTK_CONTAINER(page), 12);
 
-    group = gtk_vbox_new(FALSE, 12);
+    group = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_box_pack_start(GTK_BOX(page), group, FALSE, TRUE, 0);
 
     label = gtk_label_new(NULL);
@@ -504,11 +504,11 @@ message_prefs_widget(GtkPrintOperation * operation,
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(group), label, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start(GTK_BOX(group), hbox, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("    "),
 		       FALSE, FALSE, 0);
-    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);
 
     grid = gtk_grid_new();
@@ -527,7 +527,7 @@ message_prefs_widget(GtkPrintOperation * operation,
 	add_font_button(_("_Footer Font:"), balsa_app.print_footer_font,
 			GTK_GRID(grid), 2);
 
-    group = gtk_vbox_new(FALSE, 12);
+    group = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_box_pack_start(GTK_BOX(page), group, FALSE, TRUE, 0);
 
     label = gtk_label_new(NULL);
@@ -538,11 +538,11 @@ message_prefs_widget(GtkPrintOperation * operation,
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(group), label, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start(GTK_BOX(group), hbox, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("    "),
 		       FALSE, FALSE, 0);
-    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);
 
     print_prefs->highlight_cited =
@@ -562,7 +562,7 @@ message_prefs_widget(GtkPrintOperation * operation,
     gtk_box_pack_start(GTK_BOX(vbox), print_prefs->highlight_phrases,
 		       FALSE, TRUE, 0);
 
-    group = gtk_vbox_new(FALSE, 12);
+    group = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_box_pack_start(GTK_BOX(page), group, FALSE, TRUE, 0);
 
     label = gtk_label_new(NULL);
@@ -573,11 +573,11 @@ message_prefs_widget(GtkPrintOperation * operation,
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(group), label, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start(GTK_BOX(group), hbox, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("    "),
 		       FALSE, FALSE, 0);
-    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);
 
     grid = gtk_grid_new();
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index fd0adaa..e03f6cc 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1886,7 +1886,7 @@ sw_get_user_codeset(BalsaSendmsg * bsmsg, gboolean * change_type,
 
     if (change_type) {
         GtkWidget *label = gtk_label_new(_("Attach as MIME type:"));
-        GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
+        GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
         combo_box = gtk_combo_box_text_new();
 
         gtk_box_pack_start(content_box, hbox, TRUE, TRUE, 5);
@@ -3680,8 +3680,8 @@ quote_parts_select_dlg(GtkTreeStore *tree_store, GtkWindow * parent)
     gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0);
 
     /* stolen form gtk/gtkmessagedialog.c */
-    hbox = gtk_hbox_new (FALSE, 12);
-    vbox = gtk_vbox_new (FALSE, 12);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
 
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
@@ -4548,7 +4548,7 @@ sendmsg_window_new()
 {
     BalsaToolbarModel *model;
     GtkWidget *window;
-    GtkWidget *main_box = gtk_vbox_new(FALSE, 0);
+    GtkWidget *main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     BalsaSendmsg *bsmsg = NULL;
 #if HAVE_GTKSOURCEVIEW
     GtkSourceBuffer *source_buffer;
@@ -5705,7 +5705,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
 
     dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(no_subj_dialog));
 
-    hbox = gtk_hbox_new (FALSE, 12);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
     gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
 
@@ -5713,7 +5713,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
     gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
     gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
 
-    vbox = gtk_vbox_new (FALSE, 12);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
     gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
 
     text_str = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
@@ -5726,7 +5726,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
     gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
     gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 
-    hbox = gtk_hbox_new (FALSE, 6);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
     label = gtk_label_new (_("Subject:"));
@@ -5754,7 +5754,7 @@ subject_not_empty(BalsaSendmsg * bsmsg)
     alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
     gtk_container_add (GTK_CONTAINER (okbutton), alignment);
 
-    hbox = gtk_hbox_new (FALSE, 2);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
     gtk_container_add (GTK_CONTAINER (alignment), hbox);
 
     image = gtk_image_new_from_stock (BALSA_PIXMAP_SEND, GTK_ICON_SIZE_BUTTON);
@@ -5857,7 +5857,7 @@ check_suggest_encryption(BalsaSendmsg * bsmsg)
 	alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
 	gtk_container_add(GTK_CONTAINER(button), alignment);
 
-	hbox = gtk_hbox_new(FALSE, 2);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
 	gtk_container_add(GTK_CONTAINER(alignment), hbox);
 	image = gtk_image_new_from_stock(BALSA_PIXMAP_GPG_ENCRYPT, GTK_ICON_SIZE_BUTTON);
 	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
@@ -5871,7 +5871,7 @@ check_suggest_encryption(BalsaSendmsg * bsmsg)
 	alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
 	gtk_container_add(GTK_CONTAINER(button), alignment);
 
-	hbox = gtk_hbox_new(FALSE, 2);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
 	gtk_container_add(GTK_CONTAINER(alignment), hbox);
 	image = gtk_image_new_from_stock(BALSA_PIXMAP_SEND, GTK_ICON_SIZE_BUTTON);
 	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index 141432e..a385142 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -178,7 +178,7 @@ customize_dialog_cb(GtkWidget * widget, gpointer data)
     gtk_container_set_border_width(GTK_CONTAINER(option_frame), 6);
     gtk_box_pack_start(GTK_BOX(content_area), option_frame, FALSE, FALSE, 0);
 
-    option_box = gtk_vbox_new(FALSE, 6);
+    option_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
     gtk_container_set_border_width(GTK_CONTAINER(option_box), 6);
     gtk_container_add(GTK_CONTAINER(option_frame), option_box);
 
@@ -385,7 +385,7 @@ create_toolbar_page(BalsaToolbarModel * model, GtkUIManager * ui_manager)
     page->model = model;
 
     /* The "window itself" */
-    outer_box=gtk_vbox_new(FALSE, 0);
+    outer_box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     g_object_set_data_full(G_OBJECT(outer_box), BALSA_KEY_TOOLBAR_PAGE,
                            page, g_free);
 
@@ -394,7 +394,7 @@ create_toolbar_page(BalsaToolbarModel * model, GtkUIManager * ui_manager)
     gtk_container_set_border_width(GTK_CONTAINER(toolbar_frame), 5);
     gtk_box_pack_start(GTK_BOX(outer_box), toolbar_frame, FALSE, FALSE, 0);
 
-    toolbar_ctlbox=gtk_vbox_new(FALSE, 5);
+    toolbar_ctlbox=gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
     gtk_container_add(GTK_CONTAINER(toolbar_frame), toolbar_ctlbox);
     gtk_container_set_border_width(GTK_CONTAINER(toolbar_ctlbox), 5);
 
@@ -437,7 +437,7 @@ create_toolbar_page(BalsaToolbarModel * model, GtkUIManager * ui_manager)
     /* Done with preview */
 
     /* Box for lower half of window */
-    lower_ctlbox=gtk_hbox_new(FALSE, 5);
+    lower_ctlbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
     gtk_container_set_border_width(GTK_CONTAINER(lower_ctlbox), 5);
 
     gtk_box_pack_start(GTK_BOX(outer_box), lower_ctlbox, TRUE, TRUE, 0);
@@ -470,9 +470,10 @@ create_toolbar_page(BalsaToolbarModel * model, GtkUIManager * ui_manager)
     /* Done with destination list */
 
     /* Button box */
-    center_button_box=gtk_vbox_new(TRUE, 0);
+    center_button_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_set_homogeneous(GTK_BOX(center_button_box), TRUE);
 
-    button_box=gtk_vbox_new(FALSE, 0);
+    button_box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
     gtk_box_pack_start(GTK_BOX(lower_ctlbox), center_button_box,
 		       FALSE, FALSE, 0);
@@ -484,7 +485,7 @@ create_toolbar_page(BalsaToolbarModel * model, GtkUIManager * ui_manager)
         balsa_stock_button_with_label(GTK_STOCK_GO_UP, _("Up"));
     gtk_box_pack_start(GTK_BOX(button_box), page->back_button, FALSE, FALSE, 0);
 
-    move_button_box=gtk_hbox_new(FALSE, 0);
+    move_button_box=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start(GTK_BOX(button_box), move_button_box, FALSE, FALSE, 0);
 
     page->remove_button =



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]