[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-862-g719355331
paul at claws-mail.org
paul at claws-mail.org
Wed Nov 27 13:46:50 CET 2019
The branch, gtk3 has been updated
via 719355331d029fa5d1c830147e26dec02fce4a55 (commit)
from 0a9f8593af5fd70a27784d83c5a3d3b6e7e10037 (commit)
Summary of changes:
src/account.c | 10 +--
src/action.c | 4 +-
src/addrcustomattr.c | 4 +-
src/addrduplicates.c | 6 +-
src/addressadd.c | 6 +-
src/addressbook.c | 14 ++---
src/addressbook_foldersel.c | 4 +-
src/addrgather.c | 12 ++--
src/addrmerge.c | 4 +-
src/alertpanel.c | 7 ++-
src/browseldap.c | 4 +-
src/compose.c | 24 +++----
src/crash.c | 4 +-
src/editaddress.c | 28 ++++-----
src/editaddress_other_attributes_ldap.c | 8 +--
src/editbook.c | 4 +-
src/editgroup.c | 16 ++---
src/editjpilot.c | 8 +--
src/editldap.c | 18 +++---
src/editldap_basedn.c | 6 +-
src/edittags.c | 4 +-
src/editvcard.c | 4 +-
src/exphtmldlg.c | 12 ++--
src/expldifdlg.c | 12 ++--
src/export.c | 4 +-
src/foldersel.c | 2 +-
src/folderview.c | 8 +--
src/gtk/colorlabel.c | 8 +--
src/gtk/description_window.c | 4 +-
src/gtk/foldersort.c | 10 +--
src/gtk/gtkaspell.c | 4 +-
src/gtk/gtkutils.c | 8 +--
src/gtk/icon_legend.c | 4 +-
src/gtk/inputdialog.c | 4 +-
src/gtk/pluginwindow.c | 10 +--
src/gtk/prefswindow.c | 4 +-
src/gtk/progressdialog.c | 2 +-
src/gtk/quicksearch.c | 8 +--
src/gtk/sslcertwindow.c | 12 ++--
src/headerview.c | 10 +--
src/import.c | 4 +-
src/importldif.c | 16 ++---
src/importmutt.c | 4 +-
src/importpine.c | 4 +-
src/mainwindow.c | 8 +--
src/message_search.c | 6 +-
src/messageview.c | 6 +-
src/mimeview.c | 8 +--
src/password_gtk.c | 4 +-
src/prefs_account.c | 108 ++++++++++++++++----------------
src/prefs_actions.c | 14 ++---
src/prefs_compose_writing.c | 14 ++---
src/prefs_customheader.c | 12 ++--
src/prefs_display_header.c | 18 +++---
src/prefs_ext_prog.c | 2 +-
src/prefs_filtering.c | 12 ++--
src/prefs_filtering_action.c | 20 +++---
src/prefs_folder_column.c | 20 +++---
src/prefs_folder_item.c | 32 +++++-----
src/prefs_fonts.c | 2 +-
src/prefs_logging.c | 16 ++---
src/prefs_matcher.c | 34 +++++-----
src/prefs_message.c | 18 +++---
src/prefs_msg_colors.c | 54 ++++++++--------
src/prefs_other.c | 22 +++----
src/prefs_proxy.c | 10 +--
src/prefs_quote.c | 8 +--
src/prefs_receive.c | 12 ++--
src/prefs_send.c | 8 +--
src/prefs_spelling.c | 6 +-
src/prefs_summaries.c | 30 ++++-----
src/prefs_summary_column.c | 20 +++---
src/prefs_summary_open.c | 18 +++---
src/prefs_template.c | 14 ++---
src/prefs_themes.c | 10 +--
src/prefs_toolbar.c | 20 +++---
src/prefs_wrapping.c | 6 +-
src/printing.c | 4 +-
src/quote_fmt.c | 24 +++----
src/ssl_manager.c | 4 +-
src/statusbar.c | 2 +-
src/summary_search.c | 6 +-
src/summaryview.c | 18 +++---
src/textview.c | 2 +-
src/uri_opener.c | 6 +-
src/wizard.c | 66 +++++++++----------
86 files changed, 539 insertions(+), 538 deletions(-)
- Log -----------------------------------------------------------------
commit 719355331d029fa5d1c830147e26dec02fce4a55
Author: paul <paul at claws-mail.org>
Date: Wed Nov 27 12:46:45 2019 +0000
replace deprecated gtk_vbox_new() and gtk_hbox_new()
diff --git a/src/account.c b/src/account.c
index 44163c701..04aac9a0a 100644
--- a/src/account.c
+++ b/src/account.c
@@ -740,11 +740,11 @@ static void account_edit_create(void)
MANAGE_WINDOW_SIGNALS_CONNECT (window);
gtk_widget_realize(window);
- vbox = gtk_vbox_new (FALSE, 10);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -759,7 +759,7 @@ static void account_edit_create(void)
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
@@ -775,7 +775,7 @@ static void account_edit_create(void)
gtk_widget_show(list_view);
gtk_container_add(GTK_CONTAINER(scrolledwin), list_view);
- vbox2 = gtk_vbox_new (FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
@@ -815,7 +815,7 @@ static void account_edit_create(void)
g_signal_connect (G_OBJECT(up_btn), "clicked",
G_CALLBACK (account_up), NULL);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
diff --git a/src/action.c b/src/action.c
index 9200e3463..32121311e 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1312,7 +1312,7 @@ static void create_io_dialog(Children *children)
g_signal_connect(G_OBJECT(dialog), "size_allocate",
G_CALLBACK(actions_io_size_allocate_cb), NULL);
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add(GTK_CONTAINER(
gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
@@ -1351,7 +1351,7 @@ static void create_io_dialog(Children *children)
gtk_widget_show(text);
if (children->open_in) {
- input_hbox = gtk_hbox_new(FALSE, 8);
+ input_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(input_hbox);
entry = gtk_entry_new();
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index 72961b045..e9b408d36 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -474,8 +474,8 @@ static void custom_attr_window_create(void)
G_CALLBACK(custom_attr_window_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
- vbox1 = gtk_vbox_new(FALSE, 6);
- hbox1 = gtk_hbox_new(FALSE, 6);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
new_attr_label = gtk_label_new(_("New attribute name:"));
gtk_label_set_xalign(GTK_LABEL(new_attr_label), 0.0);
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 11b23c3fc..60d2124e6 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -123,7 +123,7 @@ static gboolean create_dialog()
want_search = FALSE;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
check_same_book = gtk_check_button_new_with_label(_("Show duplicates in "
"the same book"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_same_book),
@@ -346,7 +346,7 @@ static void present_finder_results(GtkWindow *parent)
GDK_HINT_MIN_SIZE);
gtk_window_set_title(GTK_WINDOW(dialog), _("Duplicate email addresses"));
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(dialog), vbox);
hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
@@ -370,7 +370,7 @@ static void present_finder_results(GtkWindow *parent)
gtk_paned_add2(GTK_PANED(hpaned), scrolled_win);
inline_edit_vbox = NULL;
} else {
- inline_edit_vbox = gtk_vbox_new(FALSE, 4);
+ inline_edit_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_paned_pack1(GTK_PANED(vpaned), scrolled_win, FALSE, FALSE);
gtk_paned_pack2(GTK_PANED(vpaned), inline_edit_vbox, TRUE, FALSE);
diff --git a/src/addressadd.c b/src/addressadd.c
index 8e5f84fc0..bb5c01507 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -198,9 +198,9 @@ static void addressadd_create( void ) {
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addressadd_size_allocate_cb), NULL);
- hbox = gtk_hbox_new(FALSE, 10);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
picture = gtk_image_new();
@@ -251,7 +251,7 @@ static void addressadd_create( void ) {
gtk_table_attach(GTK_TABLE(table), entry_rems, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND, 0, 0, 0);
/* Address book/folder tree */
- vlbox = gtk_vbox_new(FALSE, VBOX_BORDER);
+ vlbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vlbox), 4);
diff --git a/src/addressbook.c b/src/addressbook.c
index 6c6d069da..1d86d821c 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -767,7 +767,7 @@ static void addressbook_sort_list(GtkCMCList *clist, const gint col,
gtk_cmclist_sort(clist);
for(pos = 0 ; pos < N_LIST_COLS ; pos++) {
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
label = gtk_label_new(gettext(list_titles[pos]));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -930,7 +930,7 @@ static void addressbook_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
/* Menu bar */
@@ -1003,7 +1003,7 @@ static void addressbook_create(void)
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, BORDER_WIDTH);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
@@ -1056,7 +1056,7 @@ static void addressbook_create(void)
g_signal_connect(G_OBJECT(ctree), "focus_out_event",
G_CALLBACK(addressbook_address_index_focus_evt_out), NULL);
- clist_vbox = gtk_vbox_new(FALSE, 4);
+ clist_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
clist_swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
@@ -1112,7 +1112,7 @@ static void addressbook_create(void)
G_CALLBACK(addressbook_start_drag), NULL);
g_signal_connect(G_OBJECT(clist), "drag_data_get",
G_CALLBACK(addressbook_drag_data_get), NULL);
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new(_("Search"));
@@ -1130,7 +1130,7 @@ static void addressbook_create(void)
G_CALLBACK(addressbook_entry_activated), NULL);
if (!prefs_common.addressbook_use_editaddress_dialog) {
- editaddress_vbox = gtk_vbox_new(FALSE, 4);
+ editaddress_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_paned_pack1(GTK_PANED(vpaned), clist_vbox, FALSE, FALSE);
gtk_paned_pack2(GTK_PANED(vpaned), editaddress_vbox, TRUE, FALSE);
@@ -1147,7 +1147,7 @@ static void addressbook_create(void)
gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
/* Status bar */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index 3965d0ae9..a8a8629a9 100644
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -165,12 +165,12 @@ static void addressbook_foldersel_create( void )
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addressbook_foldersel_size_allocate_cb), NULL);
- 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 );
/* Address book/folder tree */
- vlbox = gtk_vbox_new(FALSE, 8);
+ vlbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vlbox), 8 );
diff --git a/src/addrgather.c b/src/addrgather.c
index 4fc254a51..5996c968e 100644
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -338,7 +338,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
#endif
/* Container */
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add(GTK_CONTAINER(addrgather_dlg.notebook), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
@@ -401,7 +401,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
CLAWS_SET_TIP(label,
_("Maximum amount of entries per folder within the newly created address book"));
- hboxs = gtk_hbox_new(FALSE, 8);
+ hboxs = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
adjFolder = GTK_ADJUSTMENT(gtk_adjustment_new(DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 0));
spinbtnFolder = gtk_spin_button_new(GTK_ADJUSTMENT(adjFolder), 1, 0);
gtk_box_pack_start(GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
@@ -418,7 +418,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
gtk_frame_set_label_align(GTK_FRAME(frameHeader), 0.01, 0.5);
/* Check boxes */
- vboxf = gtk_vbox_new(FALSE, 0);
+ vboxf = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vboxf);
gtk_container_add(GTK_CONTAINER(frameHeader), vboxf);
gtk_container_set_border_width(GTK_CONTAINER(vboxf), 8);
@@ -458,7 +458,7 @@ static void addrgather_page_finish( gint pageNum, gchar *pageLbl ) {
GtkTreeSelection *sel;
GtkTreeModel *model;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( addrgather_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), 8 );
@@ -536,7 +536,7 @@ static void addrgather_dlg_create(void)
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addrgather_size_allocate), NULL);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add(GTK_CONTAINER(window), vbox);
/* Notebook */
@@ -547,7 +547,7 @@ static void addrgather_dlg_create(void)
gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, 0);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
diff --git a/src/addrmerge.c b/src/addrmerge.c
index e7361f9b8..de87fe2d3 100644
--- a/src/addrmerge.c
+++ b/src/addrmerge.c
@@ -237,11 +237,11 @@ static void addrmerge_prompt( struct AddrMergePage *page )
g_signal_connect ( dialog, "response",
G_CALLBACK(addrmerge_dialog_cb), page);
- mvbox = gtk_vbox_new(FALSE, 4);
+ mvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_add(GTK_CONTAINER(
gtk_dialog_get_content_area(GTK_DIALOG(dialog))), mvbox);
gtk_container_set_border_width(GTK_CONTAINER(mvbox), 8);
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 8);
gtk_box_pack_start(GTK_BOX(mvbox),
hbox, FALSE, FALSE, 0);
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 9799bd64f..70eb0dea1 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -273,7 +273,7 @@ static void alertpanel_create(const gchar *title,
content_area = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_add (GTK_CONTAINER(window), content_area);
/* for title icon, label and message */
- 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(content_area), hbox);
@@ -302,7 +302,8 @@ static void alertpanel_create(const gchar *title,
gtk_widget_set_valign(image, GTK_ALIGN_START);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 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);
gtk_widget_show (vbox);
@@ -344,7 +345,7 @@ static void alertpanel_create(const gchar *title,
}
if (can_disable) {
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox,
FALSE, FALSE, 0);
diff --git a/src/browseldap.c b/src/browseldap.c
index 3e582b477..7facaffb9 100644
--- a/src/browseldap.c
+++ b/src/browseldap.c
@@ -226,7 +226,7 @@ static void browse_create( void ) {
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(browse_key_pressed), NULL);
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
content_area = gtk_dialog_get_content_area(GTK_DIALOG(window));
gtk_box_pack_start(GTK_BOX(content_area), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vbox), 8 );
@@ -258,7 +258,7 @@ static void browse_create( void ) {
gtk_label_set_xalign(GTK_LABEL(label_addr), 0.0);
/* Address book/folder tree */
- vlbox = gtk_vbox_new(FALSE, 8);
+ vlbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vlbox), 8 );
diff --git a/src/compose.c b/src/compose.c
index 187981d76..8035ac8f5 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7227,7 +7227,7 @@ static void compose_create_header_entry(Compose *compose)
gtk_widget_show(entry);
CLAWS_SET_TIP(entry,
_("Use <tab> to autocomplete from addressbook"));
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox);
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
@@ -7806,7 +7806,7 @@ static Compose *compose_create(PrefsAccount *account,
gtkut_widget_set_composer_icon(window);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
compose->ui_manager = gtk_ui_manager_new();
@@ -8010,7 +8010,7 @@ static Compose *compose_create(PrefsAccount *account,
if (prefs_common.toolbar_detachable) {
handlebox = gtk_handle_box_new();
} else {
- handlebox = gtk_hbox_new(FALSE, 0);
+ handlebox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
}
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
@@ -8018,7 +8018,7 @@ static Compose *compose_create(PrefsAccount *account,
compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
(gpointer)compose);
- vbox2 = gtk_vbox_new(FALSE, 2);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 0);
@@ -8031,7 +8031,7 @@ static Compose *compose_create(PrefsAccount *account,
compose_create_header(compose),
gtk_label_new_with_mnemonic(_("Hea_der")));
/* attachment list */
- attach_hbox = gtk_hbox_new(FALSE, 0);
+ attach_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(attach_hbox);
attach_lab1 = gtk_label_new_with_mnemonic(_("_Attachments"));
@@ -8051,7 +8051,7 @@ static Compose *compose_create(PrefsAccount *account,
gtk_label_new_with_mnemonic(_("Othe_rs")));
/* Subject */
- subject_hbox = gtk_hbox_new(FALSE, 0);
+ subject_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(subject_hbox);
subject_frame = gtk_frame_new(NULL);
@@ -8059,7 +8059,7 @@ static Compose *compose_create(PrefsAccount *account,
gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
gtk_widget_show(subject_frame);
- subject = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ subject = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
gtk_widget_show(subject);
@@ -8080,12 +8080,12 @@ static Compose *compose_create(PrefsAccount *account,
compose->subject_entry = subject_entry;
gtk_container_add(GTK_CONTAINER(subject_frame), subject);
- edit_vbox = gtk_vbox_new(FALSE, 0);
+ edit_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
/* ruler */
- ruler_hbox = gtk_hbox_new(FALSE, 0);
+ ruler_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
ruler = gtk_shruler_new(GTK_ORIENTATION_HORIZONTAL);
@@ -8382,7 +8382,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
from_name = gtk_entry_new();
g_signal_connect_after(G_OBJECT(from_name), "grab_focus",
@@ -9471,7 +9471,7 @@ static void compose_attach_property_create(gboolean *cancelled)
G_CALLBACK(attach_property_key_pressed),
cancelled);
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
table = gtk_table_new(4, 2, FALSE);
@@ -9517,7 +9517,7 @@ static void compose_attach_property_create(gboolean *cancelled)
GTK_FILL, 0, 0, 0);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
diff --git a/src/crash.c b/src/crash.c
index 3b515bc29..ca43e62af 100644
--- a/src/crash.c
+++ b/src/crash.c
@@ -190,11 +190,11 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
gtk_window_set_default_size(GTK_WINDOW(window1), 460, 272);
- vbox1 = gtk_vbox_new(FALSE, 2);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show(vbox1);
gtk_container_add(GTK_CONTAINER(window1), vbox1);
- hbox1 = gtk_hbox_new(FALSE, 4);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4);
diff --git a/src/editaddress.c b/src/editaddress.c
index 15a626204..780993f6e 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -794,12 +794,12 @@ static GtkWidget* addressbook_edit_person_widgets_create( GtkWidget* container,
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(container), vbox);
- vnbox = gtk_vbox_new(FALSE, 4);
+ vnbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
gtk_widget_show(vnbox);
gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
@@ -865,7 +865,7 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
vbox = addressbook_edit_person_widgets_create(window, cancelled);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
@@ -895,7 +895,7 @@ static void addressbook_edit_person_widgetset_create( GtkWidget *parent, gboolea
if ( parent == NULL )
g_warning("addressbook_edit_person_widgetset_create: parent is NULL");
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_end(GTK_BOX(parent), vbox, TRUE, TRUE, 0);
label = gtk_label_new(_("Edit Person Data"));
@@ -1028,8 +1028,8 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
const gchar *locale;
gint top = 0;
- vbox = gtk_vbox_new( FALSE, 20 );
- hbox = gtk_hbox_new( FALSE, 8 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20 );
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8 );
gtk_widget_show( vbox );
@@ -1197,7 +1197,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
GtkCellRenderer *rdr;
GtkTreeSelection *sel;
- vbox = gtk_vbox_new( FALSE, 8 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -1209,11 +1209,11 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label );
/* Split into two areas */
- hbox = gtk_hbox_new( FALSE, 0 );
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
gtk_container_add( GTK_CONTAINER( vbox ), hbox );
/* Address list */
- vboxl = gtk_vbox_new( FALSE, 4 );
+ vboxl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
gtk_container_add( GTK_CONTAINER( hbox ), vboxl );
gtk_container_set_border_width( GTK_CONTAINER(vboxl), 4 );
@@ -1305,7 +1305,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
#endif
/* Button box */
- vboxb = gtk_vbox_new( FALSE, 4 );
+ vboxb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
vbuttonbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
@@ -1433,7 +1433,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
GtkCellRenderer *rdr;
GtkTreeSelection *sel;
- vbox = gtk_vbox_new( FALSE, 8 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -1445,11 +1445,11 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label );
/* Split into two areas */
- hbox = gtk_hbox_new( FALSE, 0 );
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
gtk_container_add( GTK_CONTAINER( vbox ), hbox );
/* Attribute list */
- vboxl = gtk_vbox_new( FALSE, 4 );
+ vboxl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
gtk_container_add( GTK_CONTAINER( hbox ), vboxl );
gtk_container_set_border_width( GTK_CONTAINER(vboxl), 4 );
@@ -1535,7 +1535,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(entry_name),
prefs_common.addressbook_custom_attributes);
/* Button box */
- vboxb = gtk_vbox_new( FALSE, 4 );
+ vboxb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
vbuttonbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
index 1b18f4024..2e4e1bafb 100644
--- a/src/editaddress_other_attributes_ldap.c
+++ b/src/editaddress_other_attributes_ldap.c
@@ -331,7 +331,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
personEditDlg = dialog;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(personEditDlg->notebook), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH);
@@ -343,11 +343,11 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
gtk_notebook_get_nth_page(GTK_NOTEBOOK(personEditDlg->notebook), pageNum), label);
/* Split into two areas */
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
/* Attribute list */
- vboxl = gtk_vbox_new(FALSE, 4);
+ vboxl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_add(GTK_CONTAINER(hbox), vboxl);
gtk_container_set_border_width(GTK_CONTAINER(vboxl), 4);
@@ -417,7 +417,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
gtk_table_attach(GTK_TABLE(table), entry_value, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* Button box */
- vboxb = gtk_vbox_new(FALSE, 4);
+ vboxb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
vbuttonbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
diff --git a/src/editbook.c b/src/editbook.c
index bebe078e0..a1f52a3eb 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -155,7 +155,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
G_CALLBACK(edit_book_key_pressed),
cancelled);
- 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), 0 );
@@ -188,7 +188,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
gtk_table_attach(GTK_TABLE(table), file_label, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/editgroup.c b/src/editgroup.c
index 91c90abfd..28cdad290 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -304,13 +304,13 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(addressbook_edit_group_size_allocate_cb), NULL);
- vbox = gtk_vbox_new( FALSE, 6 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6 );
gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH);
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( window ), vbox );
/* Group area */
- hboxg = gtk_hbox_new( FALSE, 0 );
+ hboxg = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
gtk_box_pack_start(GTK_BOX(vbox), hboxg, FALSE, FALSE, 0);
/* Data entry area */
@@ -330,15 +330,15 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* List area */
- hboxl = gtk_hbox_new( FALSE, 6 );
+ hboxl = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6 );
gtk_container_set_border_width( GTK_CONTAINER(hboxl), 8 );
gtk_box_pack_start(GTK_BOX(vbox), hboxl, TRUE, TRUE, 0);
/* Group list */
- vboxl = gtk_vbox_new( FALSE, 0 );
+ vboxl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0 );
gtk_box_pack_start(GTK_BOX(hboxl), vboxl, TRUE, TRUE, 0);
- hboxh = gtk_hbox_new( FALSE, 0 );
+ hboxh = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
gtk_container_set_border_width( GTK_CONTAINER(hboxh), 4 );
gtk_box_pack_start(GTK_BOX(vboxl), hboxh, FALSE, FALSE, 0);
label = gtk_label_new(_("Addresses in Group"));
@@ -367,10 +367,10 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_widget_set_can_focus(GTK_CMCLIST(clist_group)->column[i].button, FALSE);
/* Available list */
- vboxl = gtk_vbox_new( FALSE, 0 );
+ vboxl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0 );
gtk_box_pack_start(GTK_BOX(hboxl), vboxl, TRUE, TRUE, 0);
- hboxh = gtk_hbox_new( FALSE, 0 );
+ hboxh = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
gtk_container_set_border_width( GTK_CONTAINER(hboxh), 4 );
gtk_box_pack_start(GTK_BOX(vboxl), hboxh, FALSE, FALSE, 0);
buttonGroup = gtkut_stock_button("list-add");
@@ -398,7 +398,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_widget_set_can_focus(GTK_CMCLIST(clist_avail)->column[i].button, FALSE);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/editjpilot.c b/src/editjpilot.c
index d7f97f539..c34e494c4 100644
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -241,7 +241,7 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
G_CALLBACK(edit_jpilot_key_pressed),
cancelled);
- 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), 0 );
@@ -281,9 +281,9 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
gtk_table_attach(GTK_TABLE(table), frame_custom, 1, 2, top, (top + JPILOT_NUM_CUSTOM_LABEL), GTK_FILL, 0, 0, 0);
/* Now do custom labels. */
- vbox_custom = gtk_vbox_new (FALSE, 8);
+ vbox_custom = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
for( i = 0; i < JPILOT_NUM_CUSTOM_LABEL; i++ ) {
- hlbox = gtk_hbox_new( FALSE, 0 );
+ hlbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
custom_check[i] = gtk_check_button_new();
custom_label[i] = gtk_label_new( "" );
gtk_box_pack_start( GTK_BOX(hlbox), custom_check[i], FALSE, FALSE, 0 );
@@ -296,7 +296,7 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
gtk_container_set_border_width( GTK_CONTAINER(vbox_custom), 8 );
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/editldap.c b/src/editldap.c
index 66fd0b540..e1493dbe5 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -342,7 +342,7 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
G_CALLBACK(edit_ldap_key_pressed),
cancelled);
- vbox = gtk_vbox_new( FALSE, 6 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( window ), vbox );
@@ -353,7 +353,7 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
gtk_container_set_border_width( GTK_CONTAINER( notebook ), 6 );
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
@@ -407,7 +407,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *lookdn_btn;
gint top;
- vbox = gtk_vbox_new( FALSE, 8 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( ldapedit.notebook ), vbox );
@@ -459,7 +459,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- hbox_spin = gtk_hbox_new (FALSE, 8);
+ hbox_spin = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
spinbtn_port_adj = GTK_ADJUSTMENT(gtk_adjustment_new (389, 1, 65535, 1, 1000, 0));
spinbtn_port = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_port_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, TRUE, FALSE, 0);
@@ -557,7 +557,7 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
GtkWidget *reset_btn;
gint top;
- vbox = gtk_vbox_new( FALSE, 8 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( ldapedit.notebook ), vbox );
@@ -601,7 +601,7 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- hbox_spin = gtk_hbox_new (FALSE, 8);
+ hbox_spin = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
spinbtn_queryage_adj = GTK_ADJUSTMENT(gtk_adjustment_new(
LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 0 ));
spinbtn_queryage = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_queryage_adj), 1, 0);
@@ -689,7 +689,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
GtkWidget *spinbtn_maxentry;
gint top;
- vbox = gtk_vbox_new( FALSE, 8 );
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( ldapedit.notebook ), vbox );
@@ -749,7 +749,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- hbox_spin = gtk_hbox_new (FALSE, 8);
+ hbox_spin = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
spinbtn_timeout_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 300, 1, 10, 0));
spinbtn_timeout = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_timeout_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_timeout, FALSE, FALSE, 0);
@@ -766,7 +766,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- hbox_spin = gtk_hbox_new (FALSE, 8);
+ hbox_spin = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
spinbtn_maxentry_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 500, 1, 10, 0));
spinbtn_maxentry = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_maxentry_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_maxentry, FALSE, FALSE, 0);
diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index e767679f5..8185d2138 100644
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -158,7 +158,7 @@ static void edit_ldap_bdn_create(void) {
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(edit_ldap_bdn_key_pressed), NULL );
- 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), 0 );
@@ -198,7 +198,7 @@ static void edit_ldap_bdn_create(void) {
gtk_table_attach(GTK_TABLE(table), basedn_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* Basedn list */
- vlbox = gtk_vbox_new(FALSE, 8);
+ vlbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vlbox), 8 );
@@ -231,7 +231,7 @@ static void edit_ldap_bdn_create(void) {
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/edittags.c b/src/edittags.c
index e2c8043ef..9e38a4e39 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -558,8 +558,8 @@ static void apply_window_create(void)
G_CALLBACK(apply_window_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
- vbox1 = gtk_vbox_new(FALSE, 6);
- hbox1 = gtk_hbox_new(FALSE, 6);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
new_tag_label = gtk_label_new(_("New tag:"));
gtk_label_set_xalign(GTK_LABEL(new_tag_label), 0.0);
diff --git a/src/editvcard.c b/src/editvcard.c
index f84b66a96..d042ea13f 100644
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -158,7 +158,7 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
G_CALLBACK(edit_vcard_key_pressed),
cancelled);
- 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), 0 );
@@ -193,7 +193,7 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
index fdd73883f..784a22b5f 100644
--- a/src/exphtmldlg.c
+++ b/src/exphtmldlg.c
@@ -348,7 +348,7 @@ static void export_html_page_file( gint pageNum, gchar *pageLbl ) {
GtkWidget *btnFile;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( exphtml_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -422,7 +422,7 @@ static void export_html_page_format( gint pageNum, gchar *pageLbl ) {
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( exphtml_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -518,7 +518,7 @@ static void export_html_page_finish( gint pageNum, gchar *pageLbl ) {
GtkWidget *btnBrowse;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( exphtml_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -598,11 +598,11 @@ static void export_html_dialog_create( void ) {
G_CALLBACK(export_html_key_pressed),
NULL );
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- vnbox = gtk_vbox_new(FALSE, 4);
+ vnbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
gtk_widget_show(vnbox);
gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
@@ -616,7 +616,7 @@ static void export_html_dialog_create( void ) {
gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/expldifdlg.c b/src/expldifdlg.c
index 03b22c278..c9144e209 100644
--- a/src/expldifdlg.c
+++ b/src/expldifdlg.c
@@ -365,7 +365,7 @@ static void export_ldif_page_file( gint pageNum, gchar *pageLbl ) {
GtkWidget *btnFile;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( expldif_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -466,7 +466,7 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) {
GtkTreeIter iter;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( expldif_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -591,7 +591,7 @@ static void export_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
GtkWidget *labelFile;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( expldif_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -662,11 +662,11 @@ static void export_ldif_dialog_create( void ) {
G_CALLBACK(export_ldif_key_pressed),
NULL );
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- vnbox = gtk_vbox_new(FALSE, 4);
+ vnbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
gtk_widget_show(vnbox);
gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
@@ -680,7 +680,7 @@ static void export_ldif_dialog_create( void ) {
gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/export.c b/src/export.c
index 724476690..06f8333d5 100644
--- a/src/export.c
+++ b/src/export.c
@@ -120,10 +120,10 @@ static void export_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
diff --git a/src/foldersel.c b/src/foldersel.c
index 928e4fec8..940ad2142 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -261,7 +261,7 @@ static void foldersel_create(const gchar *title)
G_CALLBACK(foldersel_size_allocate_cb), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
if (title != NULL) {
diff --git a/src/folderview.c b/src/folderview.c
index 1eb2dd9ed..c7bc09a8b 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -365,10 +365,10 @@ static void folderview_column_set_titles(FolderView *folderview)
gtk_cmclist_column_titles_active(GTK_CMCLIST(ctree));
- hbox_folder = gtk_hbox_new(FALSE, 4);
- hbox_new = gtk_hbox_new(FALSE, 4);
- hbox_unread = gtk_hbox_new(FALSE, 4);
- hbox_total = gtk_hbox_new(FALSE, 4);
+ hbox_folder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+ hbox_new = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+ hbox_unread = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+ hbox_total = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
/* left justified */
gtk_box_pack_start(GTK_BOX(hbox_folder), label_folder, TRUE, TRUE, 0);
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index 5cefbf381..c06b6910f 100644
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -318,11 +318,11 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index, gboolean fo
label = gtk_label_new(label_colors[menu_index][color_index].label);
gtk_widget_show(label);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox);
gtk_container_add(GTK_CONTAINER(item), hbox);
- vbox = gtk_vbox_new(TRUE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 1);
@@ -387,11 +387,11 @@ GtkWidget *colorlabel_create_color_menu(void)
label = gtk_label_new(label_colors[0][i].label);
gtk_widget_show(label);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox);
gtk_container_add(GTK_CONTAINER(item), hbox);
- vbox = gtk_vbox_new(TRUE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 1);
diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index acb82f2ef..cb2a6884e 100644
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -153,10 +153,10 @@ static void description_create(DescriptionWindow * dwindow)
gtkut_stock_button_set_create(&hbbox, &close_btn, _("_Close"),
NULL, NULL, NULL, NULL);
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_add(GTK_CONTAINER(dwindow->window), vbox);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new(gettext(dwindow->description));
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index fd583e7a1..abbcf14cf 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -258,7 +258,7 @@ void foldersort_open()
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(key_pressed), dialog);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -274,12 +274,12 @@ void foldersort_open()
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(cancel_clicked), dialog);
- vbox1 = gtk_vbox_new(FALSE, 8);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
@@ -291,7 +291,7 @@ void foldersort_open()
gtk_label_set_line_wrap(GTK_LABEL(label1), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), label1, FALSE, FALSE, 0);
- hbox2 = gtk_hbox_new(FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox2);
gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, TRUE, 0);
@@ -326,7 +326,7 @@ void foldersort_open()
gtk_widget_show(folderlist);
gtk_container_add(GTK_CONTAINER(scrolledwindow1), folderlist);
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox2), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 2ebe0c8e1..e1ee183f9 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1450,7 +1450,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
G_OBJECT(dialog));
gtk_box_set_spacing (GTK_BOX (content_area), 14);
- 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 (content_area), hbox, FALSE, FALSE, 0);
@@ -1467,7 +1467,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
gtk_widget_set_valign(icon, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 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);
gtk_widget_show (vbox);
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 5b180253f..624411312 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -785,11 +785,11 @@ GtkWidget *label_window_create(const gchar *str)
label = gtk_label_new(str);
- vbox = gtk_vbox_new(FALSE, 6);
- hbox = gtk_hbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, 6);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start(GTK_BOX(hbox), wait_progress, TRUE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -1003,7 +1003,7 @@ GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **pframe,
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5);
- vbox = gtk_vbox_new (FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER (frame), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index 4ab55fc2d..55fbfc049 100644
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -134,11 +134,11 @@ static void legend_create(void)
G_CALLBACK(key_pressed), NULL);
gtk_widget_realize(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), 2);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index 1f83c92d0..2620cba53 100644
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -303,7 +303,7 @@ static void input_dialog_create(gboolean is_password)
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 14);
- 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 (vbox), hbox,
@@ -321,7 +321,7 @@ static void input_dialog_create(gboolean is_password)
gtk_widget_set_valign(icon_p, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), icon_p, FALSE, FALSE, 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);
gtk_widget_show (vbox);
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 9fe575ac8..9b7b7e3ae 100644
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -305,17 +305,17 @@ void pluginwindow_create()
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
manage_window_set_transient(GTK_WINDOW(window));
- vbox1 = gtk_vbox_new(FALSE, 4);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox1);
gtk_container_add(GTK_CONTAINER(window), vbox1);
gtk_box_set_homogeneous(GTK_BOX(vbox1), FALSE);
gtk_widget_realize(window);
- hbox2 = gtk_hbox_new(FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox2);
gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, TRUE, 0);
- vbox3 = gtk_vbox_new(FALSE, 4);
+ vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox3);
gtk_box_pack_start(GTK_BOX(hbox2), vbox3, FALSE, FALSE, 0);
@@ -340,7 +340,7 @@ void pluginwindow_create()
gtk_widget_show(hbuttonbox1);
gtk_box_pack_start(GTK_BOX(vbox3), hbuttonbox1, FALSE, FALSE, 0);
- vbox2 = gtk_vbox_new(FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox2);
gtk_box_pack_start(GTK_BOX(hbox2), vbox2, TRUE, TRUE, 0);
@@ -369,7 +369,7 @@ void pluginwindow_create()
gtk_widget_show(plugin_desc);
gtk_container_add(GTK_CONTAINER(scrolledwindow3), plugin_desc);
- hbox_info = gtk_hbox_new(FALSE, 5);
+ hbox_info = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_show(hbox_info);
desc_lbl = gtk_label_new("");
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 180ae74e4..4c600b12f 100644
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -431,7 +431,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
GTK_WINDOW(mainwindow_get_mainwindow()->window));
gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
- prefswindow->vbox = gtk_vbox_new(FALSE, 6);
+ prefswindow->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(prefswindow->vbox);
prefswindow->paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
@@ -455,7 +455,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
prefswindow->tree_view);
- prefswindow->vbox2 = gtk_vbox_new(FALSE, 2);
+ prefswindow->vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show(prefswindow->vbox2);
gtk_paned_add2(GTK_PANED(prefswindow->paned), prefswindow->vbox2);
diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c
index a44a2c764..6b34f9fc6 100644
--- a/src/gtk/progressdialog.c
+++ b/src/gtk/progressdialog.c
@@ -78,7 +78,7 @@ ProgressDialog *progress_dialog_create(void)
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_set_spacing(GTK_BOX(vbox), 8);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox,
FALSE, FALSE, 8);
gtk_widget_show(hbox);
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 8768d8473..c088dc47b 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -560,7 +560,7 @@ static void quicksearch_set_button(GtkButton *button, const gchar *icon, const g
gtk_container_remove(GTK_CONTAINER(button), GTK_WIDGET(cur->data));
g_list_free(children);
- box = gtk_hbox_new(FALSE, 0);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add(GTK_CONTAINER(button), box);
if (icon_visible || !text || !*text || icon != NULL)
@@ -815,7 +815,7 @@ QuickSearch *quicksearch_new()
quicksearch->extended_search_strings = NULL;
/* quick search */
- hbox_search = gtk_hbox_new(FALSE, 0);
+ hbox_search = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
menu = gtk_list_store_new(4,
G_TYPE_STRING,
@@ -918,14 +918,14 @@ QuickSearch *quicksearch_new()
search_string_entry = gtk_combo_box_text_new_with_entry ();
gtk_combo_box_set_active(GTK_COMBO_BOX(search_string_entry), -1);
- vbox = gtk_vbox_new(TRUE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), search_string_entry, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox_search), vbox, TRUE, TRUE, 4);
gtk_widget_show(vbox);
gtk_widget_show(search_string_entry);
- search_hbox = gtk_hbox_new(FALSE, 5);
+ search_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
clear_search = gtkut_stock_button("edit-clear");
gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
FALSE, FALSE, 0);
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 6e9310f21..8047f3f98 100644
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -180,8 +180,8 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
else if (exp_time_t < time(NULL))
sig_status = g_strconcat(sig_status,_(" (expired)"),NULL);
- vbox = gtk_vbox_new(FALSE, 5);
- hbox = gtk_hbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
frame_owner = gtk_frame_new(_("Owner"));
frame_signer = gtk_frame_new(_("Signer"));
@@ -358,7 +358,7 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
gchar *invalid_str = sslcertwindow_get_invalid_str(cert);
const gchar *title;
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
buf = g_strdup_printf(_("Certificate for %s is unknown.\n%sDo you want to accept it?"), cert->host, invalid_str);
g_free(invalid_str);
@@ -407,7 +407,7 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert)
gchar *invalid_str = sslcertwindow_get_invalid_str(cert);
const gchar *title;
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
buf = g_strdup_printf(_("Certificate for %s is expired.\n%sDo you want to continue?"), cert->host, invalid_str);
g_free(invalid_str);
@@ -459,7 +459,7 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert
gchar *invalid_str = sslcertwindow_get_invalid_str(new_cert);
const gchar *title;
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
label = gtk_label_new(_("New certificate:"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_box_pack_end(GTK_BOX(vbox), new_cert_widget, TRUE, TRUE, 0);
@@ -471,7 +471,7 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert
gtk_box_pack_end(GTK_BOX(vbox), label, TRUE, TRUE, 0);
gtk_widget_show_all(vbox);
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
buf = g_strdup_printf(_("Certificate for %s has changed.\n%sDo you want to accept it?"), new_cert->host, invalid_str);
g_free(invalid_str);
diff --git a/src/headerview.c b/src/headerview.c
index 78c5443dc..709a51787 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -71,16 +71,16 @@ HeaderView *headerview_create(void)
debug_print("Creating header view...\n");
headerview = g_new0(HeaderView, 1);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
- 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);
- hbox1 = gtk_hbox_new(FALSE, 4);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 0);
- hbox2 = gtk_hbox_new(FALSE, 4);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
- hbox3 = gtk_hbox_new(FALSE, 4);
+ hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox3, FALSE, FALSE, 0);
from_header_label = gtk_label_new(prefs_common_translated_header_name("From:"));
diff --git a/src/import.c b/src/import.c
index aefbc7546..fa083662e 100644
--- a/src/import.c
+++ b/src/import.c
@@ -120,10 +120,10 @@ static void import_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
diff --git a/src/importldif.c b/src/importldif.c
index 98f2a6d26..b66cfce17 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -518,7 +518,7 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) {
GtkWidget *btnFile;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( impldif_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -667,7 +667,7 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
GtkTreeViewColumn *col;
GtkTreeSelection *sel;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( impldif_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), 4 );
@@ -679,7 +679,7 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
label );
/* Upper area - Field list */
- vboxt = gtk_vbox_new( FALSE, 4 );
+ vboxt = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
gtk_container_add( GTK_CONTAINER( vbox ), vboxt );
scrollwin = gtk_scrolled_window_new( NULL, NULL );
@@ -726,7 +726,7 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
gtk_container_add( GTK_CONTAINER(scrollwin), view_fields );
/* Lower area - Edit area */
- vboxb = gtk_vbox_new( FALSE, 4 );
+ vboxb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4 );
gtk_box_pack_end(GTK_BOX(vbox), vboxb, FALSE, FALSE, 2);
/* Data entry area */
@@ -828,7 +828,7 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
GtkWidget *labelRecs;
gint top;
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add( GTK_CONTAINER( impldif_dlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
@@ -909,11 +909,11 @@ static void imp_ldif_dialog_create() {
G_CALLBACK(imp_ldif_key_pressed),
NULL );
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- vnbox = gtk_vbox_new(FALSE, 4);
+ vnbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
gtk_widget_show(vnbox);
gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
@@ -926,7 +926,7 @@ static void imp_ldif_dialog_create() {
gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/importmutt.c b/src/importmutt.c
index 95ed74d63..2293aa4de 100644
--- a/src/importmutt.c
+++ b/src/importmutt.c
@@ -208,7 +208,7 @@ static void imp_mutt_create( gboolean *cancelled ) {
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(imp_mutt_key_pressed), cancelled);
- 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), 0 );
@@ -240,7 +240,7 @@ static void imp_mutt_create( gboolean *cancelled ) {
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/importpine.c b/src/importpine.c
index 5481c7de9..0141fb4dc 100644
--- a/src/importpine.c
+++ b/src/importpine.c
@@ -207,7 +207,7 @@ static void imp_pine_create( gboolean *cancelled ) {
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(imp_pine_key_pressed), cancelled);
- 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), 0 );
@@ -239,7 +239,7 @@ static void imp_pine_create( gboolean *cancelled ) {
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5359ea1f0..cd7060d79 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1479,7 +1479,7 @@ MainWindow *main_window_create()
gtkut_widget_set_app_icon(window);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -1909,7 +1909,7 @@ MainWindow *main_window_create()
g_signal_connect(G_OBJECT(handlebox), "child_detached",
G_CALLBACK(toolbar_child_detached), mainwin);
} else {
- handlebox = gtk_hbox_new(FALSE, 0);
+ handlebox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(handlebox);
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
}
@@ -1925,13 +1925,13 @@ MainWindow *main_window_create()
LEARN_SPAM);
/* vbox that contains body */
- vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
+ vbox_body = gtk_box_new(GTK_ORIENTATION_VERTICAL, BORDER_WIDTH);
gtk_widget_show(vbox_body);
gtk_container_set_border_width(GTK_CONTAINER(vbox_body), BORDER_WIDTH);
gtk_box_pack_start(GTK_BOX(vbox), vbox_body, TRUE, TRUE, 0);
#ifndef GENERIC_UMPC
- hbox_stat = gtk_hbox_new(FALSE, 2);
+ hbox_stat = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
warning_icon = gtkut_stock_button("dialog-warning");
diff --git a/src/message_search.c b/src/message_search.c
index 7fcb15438..a1913afe9 100644
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -181,11 +181,11 @@ static void message_search_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox1 = gtk_vbox_new (FALSE, 0);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (window), vbox1);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
@@ -207,7 +207,7 @@ static void message_search_create(void)
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((body_entry)))),
"focus_out_event", G_CALLBACK(body_entry_focus_evt_out), NULL);
- checkbtn_hbox = gtk_hbox_new (FALSE, 8);
+ checkbtn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (checkbtn_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), checkbtn_hbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (checkbtn_hbox), 8);
diff --git a/src/messageview.c b/src/messageview.c
index d05238b02..f7ef77f4f 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -415,7 +415,7 @@ MessageView *messageview_create(MainWindow *mainwin)
mimeview->textview->messageview = messageview;
mimeview->messageview = messageview;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(headerview),
FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(noticeview),
@@ -468,7 +468,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
GtkActionGroup *action_group;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -675,7 +675,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
if (prefs_common.toolbar_detachable) {
handlebox = gtk_handle_box_new();
} else {
- handlebox = gtk_hbox_new(FALSE, 0);
+ handlebox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
}
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
gtk_widget_realize(handlebox);
diff --git a/src/mimeview.c b/src/mimeview.c
index 25fe562d6..318353929 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -400,7 +400,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
g_signal_connect(G_OBJECT(mime_toggle), "button_release_event",
G_CALLBACK(mime_toggle_button_cb), mimeview);
- icon_mainbox = gtk_vbox_new(FALSE, 0);
+ icon_mainbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(icon_mainbox);
gtk_widget_set_size_request(icon_mainbox, 32, -1);
gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
@@ -409,7 +409,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
g_signal_connect(G_OBJECT(icon_mainbox), "size_allocate",
G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
- ctree_mainbox = gtk_hbox_new(FALSE, 0);
+ ctree_mainbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
G_CALLBACK(ctree_size_allocate_cb), mimeview);
@@ -456,7 +456,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_ui_manager_get_widget(mimeview->ui_manager, "/Menus/MimeView")) );
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
siginfoview = noticeview_create(mainwin);
noticeview_hide(siginfoview);
@@ -469,7 +469,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
diff --git a/src/password_gtk.c b/src/password_gtk.c
index f65dae42e..0002046bd 100644
--- a/src/password_gtk.c
+++ b/src/password_gtk.c
@@ -126,7 +126,7 @@ void master_passphrase_change_dialog()
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_set_spacing(GTK_BOX(vbox), 14);
- 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(vbox), hbox, FALSE, FALSE, 0);
@@ -137,7 +137,7 @@ void master_passphrase_change_dialog()
gtk_widget_set_valign(icon, GTK_ALIGN_START);
gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 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);
gtk_widget_show(vbox);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index d058d25aa..46a175c49 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1119,11 +1119,11 @@ static void basic_create_widget_func(PrefsPage * _page,
struct BasicProtocol *protocol_optmenu;
gint i;
- 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);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, FALSE, 0);
@@ -1191,7 +1191,7 @@ static void basic_create_widget_func(PrefsPage * _page,
vbox2 = gtkut_get_options_frame(vbox1, &serv_frame, _("Server information"));
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
@@ -1200,7 +1200,7 @@ static void basic_create_widget_func(PrefsPage * _page,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
/* Create GtkHBox for protocol combobox and label */
- optmenubox = gtk_hbox_new(FALSE, 20);
+ optmenubox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 20);
gtk_widget_show(optmenubox);
gtk_box_pack_start (GTK_BOX (hbox), optmenubox, FALSE, FALSE, 0);
@@ -1522,13 +1522,13 @@ static void receive_create_widget_func(PrefsPage * _page,
GtkWidget *maxarticle_spinbtn;
GtkAdjustment *maxarticle_spinbtn_adj;
- 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);
local_vbox = gtkut_get_options_frame(vbox1, &local_frame, _("Local"));
- local_hbox = gtk_hbox_new (FALSE, 8);
+ local_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (local_hbox);
gtk_box_pack_start (GTK_BOX (local_vbox), local_hbox, FALSE, FALSE, 0);
@@ -1559,11 +1559,11 @@ static void receive_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON (vbox2, rmmail_checkbtn,
_("Remove messages on server when received"));
- 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);
- 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 (hbox1), hbox_spc, FALSE, FALSE, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
@@ -1594,7 +1594,7 @@ static void receive_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY (rmmail_checkbtn, hbox1);
- 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);
@@ -1617,7 +1617,7 @@ static void receive_create_widget_func(PrefsPage * _page,
PACK_SPACER(vbox2, vbox3, VSPACING_NARROW_2);
- 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);
@@ -1643,7 +1643,7 @@ static void receive_create_widget_func(PrefsPage * _page,
vbox2 = gtkut_get_options_frame(vbox1, &frame2, _("NNTP"));
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
@@ -1667,7 +1667,7 @@ static void receive_create_widget_func(PrefsPage * _page,
vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
- 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);
@@ -1692,7 +1692,7 @@ static void receive_create_widget_func(PrefsPage * _page,
COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN);
COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
- 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, 4);
@@ -1709,14 +1709,14 @@ static void receive_create_widget_func(PrefsPage * _page,
gtk_widget_show (imapdir_entry);
gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, 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, 4);
PACK_CHECK_BUTTON (hbox1, subsonly_checkbtn,
_("Show subscribed folders only"));
- 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, 4);
@@ -1725,7 +1725,7 @@ static void receive_create_widget_func(PrefsPage * _page,
CLAWS_SET_TIP(low_bandwidth_checkbtn,
_("This mode uses less bandwidth, but can be slower with some servers."));
- 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, 4);
@@ -1735,7 +1735,7 @@ static void receive_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON(vbox4, autochk_use_default_checkbtn,
_("Use global settings"));
- hbox2 = gtk_hbox_new(FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start(GTK_BOX(vbox4), hbox2, FALSE, FALSE, 0);
PACK_CHECK_BUTTON(hbox2, autochk_checkbtn,
@@ -1883,7 +1883,7 @@ static void send_create_widget_func(PrefsPage * _page,
GtkWidget *pop_auth_minutes_lbl;
gchar *buf;
- 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);
@@ -1897,7 +1897,7 @@ static void send_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON (vbox2, xmailer_checkbtn,
_("Add user agent header"));
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
@@ -1919,15 +1919,15 @@ static void send_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON (vbox3, smtp_auth_checkbtn,
_("SMTP Authentication (SMTP AUTH)"));
- vbox4 = gtk_vbox_new (FALSE, 0);
+ vbox4 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox4);
gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), 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);
@@ -1951,11 +1951,11 @@ static void send_create_widget_func(PrefsPage * _page,
PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), 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);
@@ -1974,11 +1974,11 @@ static void send_create_widget_func(PrefsPage * _page,
#ifdef GENERIC_UMPC
PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), 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);
@@ -2005,11 +2005,11 @@ static void send_create_widget_func(PrefsPage * _page,
PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), 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);
@@ -2032,11 +2032,11 @@ static void send_create_widget_func(PrefsPage * _page,
G_CALLBACK (pop_bfr_smtp_tm_set_sens),
NULL);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox3), 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);
@@ -2125,7 +2125,7 @@ static void compose_create_widget_func(PrefsPage * _page,
GtkWidget *combo_default_alt_dictionary = NULL;
#endif
- 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);
@@ -2134,7 +2134,7 @@ static void compose_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
_("Automatically insert signature"));
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
label_sigsep = gtk_label_new (_("Signature separator"));
@@ -2147,7 +2147,7 @@ static void compose_create_widget_func(PrefsPage * _page,
gtk_widget_set_size_request (entry_sigsep, 64, -1);
- sig_hbox = gtk_hbox_new (FALSE, 8);
+ sig_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (sig_hbox);
gtk_box_pack_start (GTK_BOX (vbox_sig), sig_hbox, FALSE, FALSE, 0);
@@ -2172,7 +2172,7 @@ static void compose_create_widget_func(PrefsPage * _page,
g_signal_connect(G_OBJECT(sigcmd_radiobtn), "clicked",
G_CALLBACK(prefs_account_sigcmd_radiobtn_cb), NULL);
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox_sig), hbox2, TRUE, TRUE, 0);
label_sigpath = gtk_label_new (_("Signature"));
@@ -2336,7 +2336,7 @@ static void templates_create_widget_func(PrefsPage * _page,
GtkWidget *vbox2;
GtkWidget *notebook;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
notebook = gtk_notebook_new();
@@ -2344,7 +2344,7 @@ static void templates_create_widget_func(PrefsPage * _page,
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
/* compose format */
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
@@ -2359,7 +2359,7 @@ static void templates_create_widget_func(PrefsPage * _page,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
/* reply format */
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
@@ -2374,7 +2374,7 @@ static void templates_create_widget_func(PrefsPage * _page,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Reply")));
/* forward format */
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
@@ -2421,15 +2421,15 @@ static void privacy_create_widget_func(PrefsPage * _page,
GtkWidget *save_clear_text_checkbtn;
GtkWidget *encrypt_to_self_checkbtn;
- 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);
- hbox1 = gtk_hbox_new(FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_container_add (GTK_CONTAINER(vbox2), hbox1);
@@ -2624,7 +2624,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
GtkWidget *label;
gchar *buf;
- 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);
@@ -2760,7 +2760,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
g_signal_connect(G_OBJECT(out_ssl_cert_browse_button), "clicked",
G_CALLBACK(prefs_account_out_cert_browse_cb), NULL);
- vbox7 = gtk_vbox_new (FALSE, 0);
+ vbox7 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox7);
gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0);
@@ -2770,11 +2770,11 @@ static void ssl_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn,
_("Use non-blocking SSL/TLS"));
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox7), 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, 16, -1);
@@ -2869,14 +2869,14 @@ static void proxy_create_widget_func(PrefsPage * _page,
GtkWidget *button;
gchar *buf;
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
proxy_checkbtn = gtk_check_button_new_with_label (_("Use proxy server"));
PACK_FRAME (vbox1, proxy_frame, NULL);
gtk_frame_set_label_widget (GTK_FRAME(proxy_frame), proxy_checkbtn);
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_add (GTK_CONTAINER (proxy_frame), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
@@ -2886,10 +2886,10 @@ static void proxy_create_widget_func(PrefsPage * _page,
_("Use global proxy server settings"));
gtk_box_pack_start (GTK_BOX (vbox2), default_proxy_checkbtn, FALSE, FALSE, 0);
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, FALSE, 0);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start (GTK_BOX (vbox3), hbox, FALSE, FALSE, 0);
socks4_radiobtn = gtk_radio_button_new_with_label(NULL, "SOCKS4");
@@ -2900,7 +2900,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
CREATE_RADIO_BUTTON(hbox, socks5_radiobtn, socks4_radiobtn, "SOCKS5",
PROXY_SOCKS5);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start (GTK_BOX (vbox3), hbox, FALSE, FALSE, 0);
label = gtk_label_new(_("Hostname"));
@@ -2917,7 +2917,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
gtk_widget_set_size_request(proxy_port_spinbtn, 64, -1);
gtk_box_pack_start(GTK_BOX(hbox), proxy_port_spinbtn, FALSE, FALSE, 0);
- vbox4 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox4 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(vbox3), vbox4, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (vbox4, proxy_auth_checkbtn, _("Use authentication"));
@@ -3050,7 +3050,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
#define PACK_HBOX(hbox) \
{ \
- hbox = gtk_hbox_new (FALSE, 8); \
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8); \
gtk_widget_show (hbox); \
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); \
}
@@ -3062,11 +3062,11 @@ static void advanced_create_widget_func(PrefsPage * _page,
gtk_box_pack_start (GTK_BOX (box), spinbtn, FALSE, FALSE, 0); \
}
- 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, VSPACING_NARROW_2);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW_2);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index a9c6be657..2b49ae3e1 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -209,7 +209,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -237,7 +237,7 @@ static void prefs_actions_create(MainWindow *mainwin)
G_CALLBACK(manual_open_with_anchor_cb),
MANUAL_ANCHOR_ACTIONS);
- vbox1 = gtk_vbox_new(FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
@@ -275,7 +275,7 @@ static void prefs_actions_create(MainWindow *mainwin)
(GtkAttachOptions) (0), 0, 0);
/* radio buttons for filter actions or shell */
- filter_hbox = gtk_hbox_new(FALSE,4);
+ filter_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,4);
gtk_table_attach(GTK_TABLE(table), filter_hbox, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
(GtkAttachOptions) (0), 0, 0);
@@ -306,7 +306,7 @@ static void prefs_actions_create(MainWindow *mainwin)
/* register / substitute / delete */
- reg_hbox = gtk_hbox_new(FALSE, 4);
+ reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(reg_hbox);
gtk_box_pack_start(GTK_BOX(vbox1), reg_hbox, FALSE, FALSE, 0);
@@ -315,7 +315,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
gtk_widget_set_size_request(arrow, -1, 16);
- btn_hbox = gtk_hbox_new(TRUE, 4);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(btn_hbox);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
@@ -359,7 +359,7 @@ static void prefs_actions_create(MainWindow *mainwin)
CLAWS_SET_TIP(info_btn,
_("Show information on configuring actions"));
- cond_hbox = gtk_hbox_new(FALSE, 8);
+ cond_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(cond_hbox);
gtk_box_pack_start(GTK_BOX(vbox1), cond_hbox, TRUE, TRUE, 0);
@@ -378,7 +378,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_widget_show(cond_list_view);
gtk_container_add(GTK_CONTAINER (cond_scrolledwin), cond_list_view);
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index d71961b20..d88df2824 100644
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -121,14 +121,14 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
GtkTreeIter iter;
gchar *text;
- 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);
/* Account autoselection */
PACK_FRAME(vbox1, frame, _("Automatic account selection"));
- hbox_autosel = gtk_hbox_new (TRUE, VSPACING_NARROW);
+ hbox_autosel = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_widget_show (hbox_autosel);
gtk_container_add (GTK_CONTAINER (frame), hbox_autosel);
gtk_container_set_border_width (GTK_CONTAINER (hbox_autosel), 8);
@@ -150,7 +150,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
#endif /* CAN_USE_EXTERNAL_EDITOR */
/* Editing: automatically save draft */
- hbox_autosave = gtk_hbox_new (FALSE, 8);
+ hbox_autosave = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_autosave);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_autosave, FALSE, FALSE, 0);
@@ -169,7 +169,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
gtk_box_pack_start (GTK_BOX (hbox_autosave), label_autosave_length, FALSE, FALSE, 0);
/* Editing: automatically save draft when encrypted */
- hbox_autosave_encrypted = gtk_hbox_new (FALSE, 8);
+ hbox_autosave_encrypted = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start(GTK_BOX(hbox_autosave_encrypted), gtk_label_new(" "), FALSE, FALSE, 0);
gtk_widget_show_all (hbox_autosave_encrypted);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_autosave_encrypted, FALSE, FALSE, 0);
@@ -178,7 +178,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
_("Even if message is to be encrypted"));
/* Editing: undo level */
- hbox_undolevel = gtk_hbox_new (FALSE, 8);
+ hbox_undolevel = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_undolevel);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_undolevel, FALSE, FALSE, 0);
@@ -194,7 +194,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_undolevel), TRUE);
/* Editing: warn when inserting large files in message body */
- hbox_warn_large_insert = gtk_hbox_new (FALSE, 8);
+ hbox_warn_large_insert = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_warn_large_insert);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_warn_large_insert, FALSE, FALSE, 0);
@@ -248,7 +248,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
COMBOBOX_ADD (menu, _("Insert"), COMPOSE_DND_INSERT);
COMBOBOX_ADD (menu, _("Attach"), COMPOSE_DND_ATTACH);
- hbox_dnd_insert_or_attach = gtk_hbox_new(FALSE, 20);
+ hbox_dnd_insert_or_attach = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 20);
gtk_widget_show(hbox_dnd_insert_or_attach);
gtk_box_pack_start(GTK_BOX(vbox1), hbox_dnd_insert_or_attach, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox_dnd_insert_or_attach),
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index c25e5134d..031f9d286 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -170,7 +170,7 @@ static void prefs_custom_header_create(void)
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -193,7 +193,7 @@ static void prefs_custom_header_create(void)
g_signal_connect (G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(prefs_custom_header_cancel), NULL);
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
@@ -242,7 +242,7 @@ static void prefs_custom_header_create(void)
/* add / delete */
- reg_hbox = gtk_hbox_new (FALSE, 4);
+ reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (reg_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), reg_hbox, FALSE, FALSE, 0);
@@ -250,7 +250,7 @@ static void prefs_custom_header_create(void)
gtk_widget_show (arrow);
gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
- btn_hbox = gtk_hbox_new (TRUE, 4);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
@@ -269,7 +269,7 @@ static void prefs_custom_header_create(void)
NULL);
- ch_hbox = gtk_hbox_new (FALSE, 8);
+ ch_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (ch_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), ch_hbox, TRUE, TRUE, 0);
@@ -284,7 +284,7 @@ static void prefs_custom_header_create(void)
gtk_widget_show (list_view);
gtk_container_add (GTK_CONTAINER (ch_scrolledwin), list_view);
- btn_vbox = gtk_vbox_new (FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (ch_hbox), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index b9bbb770b..4e62e2500 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -235,11 +235,11 @@ static void prefs_display_header_create(void)
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
- btn_hbox = gtk_hbox_new (FALSE, 8);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (btn_hbox);
gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0);
@@ -265,12 +265,12 @@ static void prefs_display_header_create(void)
G_CALLBACK(prefs_display_header_cancel),
NULL);
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
@@ -287,13 +287,13 @@ static void prefs_display_header_create(void)
gtk_box_pack_start (GTK_BOX (hbox1), hdr_combo, TRUE, TRUE, 0);
gtk_widget_set_size_request (hdr_combo, 150, -1);
- list_view_hbox = gtk_hbox_new (FALSE, 10);
+ list_view_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show (list_view_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), list_view_hbox, TRUE, TRUE, 0);
/* hidden headers list */
- list_view_hbox2 = gtk_hbox_new (FALSE, 8);
+ list_view_hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (list_view_hbox2);
gtk_box_pack_start (GTK_BOX (list_view_hbox), list_view_hbox2, TRUE, TRUE, 0);
@@ -314,7 +314,7 @@ static void prefs_display_header_create(void)
gtk_container_add (GTK_CONTAINER (list_view_scrolledwin),
hidden_headers_list_view);
- btn_vbox = gtk_vbox_new (FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
@@ -334,7 +334,7 @@ static void prefs_display_header_create(void)
/* display headers list */
- list_view_hbox1 = gtk_hbox_new (FALSE, 8);
+ list_view_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (list_view_hbox1);
gtk_box_pack_start (GTK_BOX (list_view_hbox), list_view_hbox1, TRUE, TRUE, 0);
@@ -365,7 +365,7 @@ static void prefs_display_header_create(void)
G_CALLBACK(headers_list_model_rows_reordered),
headers_list_view);
- btn_vbox = gtk_vbox_new (FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox1), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c
index 7ada796fa..2104da754 100644
--- a/src/prefs_ext_prog.c
+++ b/src/prefs_ext_prog.c
@@ -97,7 +97,7 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- vbox = gtk_vbox_new(TRUE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
gtk_table_attach(GTK_TABLE (table), vbox, 0, 1, 0, 1,
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index f8da2d52d..9b91d3dc2 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -343,7 +343,7 @@ static void prefs_filtering_create(void)
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -370,7 +370,7 @@ static void prefs_filtering_create(void)
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(prefs_filtering_cancel), NULL);
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (vbox), vbox1, FALSE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
@@ -453,7 +453,7 @@ static void prefs_filtering_create(void)
NULL);
/* register / substitute / delete */
- reg_hbox = gtk_hbox_new (FALSE, 4);
+ reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (reg_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), reg_hbox, FALSE, FALSE, 0);
@@ -462,7 +462,7 @@ static void prefs_filtering_create(void)
gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
gtk_widget_set_size_request (arrow, -1, 16);
- btn_hbox = gtk_hbox_new (TRUE, 4);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
@@ -498,7 +498,7 @@ static void prefs_filtering_create(void)
CLAWS_SET_TIP(clear_btn,
_("Clear all the input fields in the dialog"));
- cond_hbox = gtk_hbox_new (FALSE, 8);
+ cond_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (cond_hbox);
gtk_box_pack_start (GTK_BOX (vbox), cond_hbox, TRUE, TRUE, 0);
@@ -517,7 +517,7 @@ static void prefs_filtering_create(void)
gtk_widget_show (cond_list_view);
gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_list_view);
- btn_vbox = gtk_vbox_new (FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (cond_hbox), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index a5287ae85..2ebe42be9 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -385,7 +385,7 @@ static void prefs_filtering_action_create(void)
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtkut_stock_button_set_create(&confirm_area,
@@ -409,7 +409,7 @@ static void prefs_filtering_action_create(void)
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(prefs_filtering_action_cancel), NULL);
- vbox1 = gtk_vbox_new(FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER (vbox1), 2);
@@ -447,7 +447,7 @@ static void prefs_filtering_action_create(void)
/* action combo */
- hbox1 = gtk_hbox_new(FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 0, 1,
GTK_FILL, GTK_SHRINK, 0, 0);
@@ -473,7 +473,7 @@ static void prefs_filtering_action_create(void)
/* accounts */
- hbox1 = gtk_hbox_new (FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 1, 2,
GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
@@ -503,7 +503,7 @@ static void prefs_filtering_action_create(void)
/* destination */
- hbox1 = gtk_hbox_new (FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 2, 3,
GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
@@ -535,7 +535,7 @@ static void prefs_filtering_action_create(void)
gtk_box_pack_start (GTK_BOX (hbox1), tags_combo,
FALSE, FALSE, 0);
- hbox1 = gtk_hbox_new (FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), hbox1, 2, 3, 2, 3,
GTK_FILL, GTK_SHRINK, 0, 0);
@@ -561,14 +561,14 @@ static void prefs_filtering_action_create(void)
/* register / substitute / delete */
- reg_hbox = gtk_hbox_new(FALSE, 4);
+ reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(vbox1), reg_hbox, FALSE, FALSE, 0);
arrow = gtk_image_new_from_icon_name("pan-down-symbolic", GTK_ICON_SIZE_MENU);
gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
gtk_widget_set_size_request(arrow, -1, 16);
- btn_hbox = gtk_hbox_new(TRUE, 4);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
reg_btn = gtkut_stock_button("list-add");
@@ -587,7 +587,7 @@ static void prefs_filtering_action_create(void)
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_filtering_action_delete_cb), NULL);
- action_hbox = gtk_hbox_new(FALSE, 8);
+ action_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start(GTK_BOX(vbox1), action_hbox, TRUE, TRUE, 0);
action_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
@@ -603,7 +603,7 @@ static void prefs_filtering_action_create(void)
action_list_view = prefs_filtering_action_list_view_create();
gtk_container_add(GTK_CONTAINER(action_scrolledwin), action_list_view);
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_box_pack_start(GTK_BOX(action_hbox), btn_vbox, FALSE, FALSE, 0);
up_btn = gtkut_stock_button("go-up");
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index 48ff9288c..6298fac04 100644
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -217,11 +217,11 @@ static void prefs_folder_column_create(void)
G_CALLBACK(prefs_folder_column_key_pressed),
NULL);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- label_hbox = gtk_hbox_new(FALSE, 0);
+ label_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(label_hbox);
gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
@@ -232,16 +232,16 @@ static void prefs_folder_column_create(void)
gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- vbox1 = gtk_vbox_new(FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
- hbox1 = gtk_hbox_new(FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, TRUE, 0);
- clist_hbox = gtk_hbox_new(FALSE, 8);
+ clist_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(clist_hbox);
gtk_box_pack_start(GTK_BOX(hbox1), clist_hbox, TRUE, TRUE, 0);
@@ -264,7 +264,7 @@ static void prefs_folder_column_create(void)
gtk_container_add(GTK_CONTAINER(scrolledwin), stock_list_view);
/* add/remove button */
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
@@ -282,7 +282,7 @@ static void prefs_folder_column_create(void)
g_signal_connect(G_OBJECT(remove_btn), "clicked",
G_CALLBACK(prefs_folder_column_remove), NULL);
- clist_hbox = gtk_hbox_new(FALSE, 8);
+ clist_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(clist_hbox);
gtk_box_pack_start(GTK_BOX(hbox1), clist_hbox, TRUE, TRUE, 0);
@@ -305,7 +305,7 @@ static void prefs_folder_column_create(void)
gtk_container_add(GTK_CONTAINER(scrolledwin), shown_list_view);
/* up/down button */
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
@@ -322,11 +322,11 @@ static void prefs_folder_column_create(void)
g_signal_connect(G_OBJECT(down_btn), "clicked",
G_CALLBACK(prefs_folder_column_down), NULL);
- btn_hbox = gtk_hbox_new(FALSE, 8);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(btn_hbox);
gtk_box_pack_end(GTK_BOX(vbox), btn_hbox, FALSE, FALSE, 0);
- btn_vbox = gtk_vbox_new(FALSE, 0);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(btn_hbox), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 5e1aa1f0e..97505857f 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -205,7 +205,7 @@ static GtkWidget *prefs_folder_no_save_warning_create_widget() {
GtkWidget *icon;
GtkWidget *label;
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
icon = stock_pixmap_widget(STOCK_PIXMAP_NOTICE_WARN);
gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 8);
@@ -433,7 +433,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_table_attach(GTK_TABLE(table), folder_color, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), hbox, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
@@ -505,7 +505,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
rowcount++;
/* Select HTML part by default? */
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_show (hbox);
gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
@@ -547,13 +547,13 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
rowcount++;
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_table_attach(GTK_TABLE(table), hbox, 0, 3,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
rowcount++;
- 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);
@@ -575,13 +575,13 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
checkbtn_remove_old_offlinesync = gtk_check_button_new_with_label(
_("Remove older messages bodies"));
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_table_attach(GTK_TABLE(table), hbox2, 0, 3,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
rowcount++;
- 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 (hbox2), hbox_spc, FALSE, FALSE, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
@@ -1179,7 +1179,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
#endif
/* PGP sign? */
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_show (hbox);
gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
@@ -1211,7 +1211,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* PGP encrypt? */
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_show (hbox);
gtk_table_attach (GTK_TABLE(table), hbox, 0, 2,
rowcount, rowcount+1, GTK_FILL, GTK_FILL, 0, 0);
@@ -1494,7 +1494,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
page->item = item;
- page_vbox = gtk_vbox_new (FALSE, 0);
+ page_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (page_vbox), VBOX_BORDER);
gtk_widget_show (page_vbox);
@@ -1510,7 +1510,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 4);
/* compose format */
- vbox = gtk_vbox_new (FALSE, VSPACING);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
@@ -1528,7 +1528,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
vbox_format = gtk_widget_get_parent(
gtk_widget_get_parent(page->compose_body_format));
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
quotefmt_add_info_button(window, hbox);
@@ -1538,7 +1538,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Compose")));
/* reply format */
- vbox = gtk_vbox_new (FALSE, VSPACING);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
@@ -1556,7 +1556,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
vbox_format = gtk_widget_get_parent(
gtk_widget_get_parent(page->reply_body_format));
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
quotefmt_add_info_button(window, hbox);
@@ -1566,7 +1566,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Reply")));
/* forward format */
- vbox = gtk_vbox_new (FALSE, VSPACING);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
@@ -1584,7 +1584,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
vbox_format = gtk_widget_get_parent(
gtk_widget_get_parent(page->forward_body_format));
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
quotefmt_add_info_button(window, hbox);
diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index 7e9ba4a8e..b9e5f44c2 100644
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -114,7 +114,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
(GtkAttachOptions) (0), 0, 0);
row++;
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_widget_show(vbox);
gtk_table_attach (GTK_TABLE (table), vbox, 0, 4, row, row+1,
(GtkAttachOptions) GTK_FILL,
diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index 2b50358d2..f085e29bf 100644
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -72,7 +72,7 @@ static GtkWidget *prefs_logging_create_check_buttons(GtkWidget **checkbtn1,
{
GtkWidget *hbox_checkbtn;
- hbox_checkbtn = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox_checkbtn = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show(hbox_checkbtn);
PACK_CHECK_BUTTON (hbox_checkbtn, *checkbtn1, label1);
@@ -128,14 +128,14 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *checkbtn_log_status;
GtkSizeGroup *log_size_group;
- 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);
/* Protocol log */
vbox_network_log = gtkut_get_options_frame(vbox1, &frame_logging, _("Network log"));
- hbox_clip_network_log = gtk_hbox_new (FALSE, 8);
+ hbox_clip_network_log = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_container_add (GTK_CONTAINER (vbox_network_log), hbox_clip_network_log);
gtk_widget_show (hbox_clip_network_log);
@@ -166,7 +166,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (vbox1_filtering_log, checkbtn_filtering_log,
_("Enable logging of filtering/processing rules"));
- hbox_filtering_log = gtk_hbox_new (FALSE, 8);
+ hbox_filtering_log = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_container_add (GTK_CONTAINER (vbox1_filtering_log), hbox_filtering_log);
gtk_widget_show (hbox_filtering_log);
@@ -194,7 +194,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
_("post-processing folders"));
gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
- hbox_checkbtn = gtk_hbox_new(TRUE, VBOX_BORDER);
+ hbox_checkbtn = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show(hbox_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (hbox_checkbtn, checkbtn_filtering_log_folder_proc,
@@ -210,7 +210,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, frame_filtering_log);
- hbox_filtering_log_level = gtk_hbox_new (FALSE, 8);
+ hbox_filtering_log_level = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_filtering_log_level);
gtk_box_pack_start(GTK_BOX (vbox1_filtering_log), hbox_filtering_log_level, FALSE, FALSE, 0);
@@ -242,7 +242,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
"Caution: the higher the level, the greater the "
"impact on performance."));
- hbox_clip_filtering_log = gtk_hbox_new (FALSE, 8);
+ hbox_clip_filtering_log = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_container_add (GTK_CONTAINER (vbox1_filtering_log), hbox_clip_filtering_log);
gtk_widget_show (hbox_clip_filtering_log);
PACK_CHECK_BUTTON (hbox_clip_filtering_log, checkbtn_clip_filtering_log,
@@ -275,7 +275,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
label = gtk_label_new(_("Write the following information to disk..."));
gtk_widget_show(label);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_container_add (GTK_CONTAINER (vbox_disk_log), hbox);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show (hbox);
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index a7092dbf4..07e890825 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -566,7 +566,7 @@ static void prefs_matcher_create(void)
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtkut_stock_button_set_create(&confirm_area, &cancel_btn, _("_Cancel"),
@@ -588,7 +588,7 @@ static void prefs_matcher_create(void)
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(prefs_matcher_cancel), NULL);
- vbox1 = gtk_vbox_new(FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER (vbox1), 2);
@@ -600,15 +600,15 @@ static void prefs_matcher_create(void)
gtk_container_add(GTK_CONTAINER(frame), table);
gtk_widget_set_size_request(frame, -1, -1);
- upper_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
- hbox = gtk_hbox_new(FALSE, 0);
+ upper_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), upper_hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 0, 1,
GTK_FILL, GTK_SHRINK, 2, 2);
- lower_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
- hbox = gtk_hbox_new(FALSE, 0);
+ lower_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), lower_hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 1, 2,
@@ -699,7 +699,7 @@ static void prefs_matcher_create(void)
gtk_table_attach(GTK_TABLE(table), match_label, 0, 1, 1, 2,
GTK_FILL, GTK_SHRINK, 2, 2);
- match_hbox = gtk_hbox_new(FALSE, 0);
+ match_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_table_attach(GTK_TABLE(table), match_hbox, 1, 2, 1, 2,
GTK_FILL, GTK_SHRINK, 2, 2);
@@ -722,7 +722,7 @@ static void prefs_matcher_create(void)
gtk_box_pack_start(GTK_BOX(lower_hbox), match_label2, FALSE, FALSE, 0);
/* numeric value */
- numeric_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ numeric_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(lower_hbox), numeric_hbox, FALSE, FALSE, 0);
numeric_entry = gtk_spin_button_new_with_range(0, 1000, 1);
@@ -741,10 +741,10 @@ static void prefs_matcher_create(void)
gtk_box_pack_start(GTK_BOX(lower_hbox), string_entry, TRUE, TRUE, 0);
gtk_widget_set_size_request(string_entry, 300, -1);
- hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_size_group_add_widget(size_group, hbox);
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
PACK_CHECK_BUTTON(vbox, case_checkbtn, _("Case sensitive"));
PACK_CHECK_BUTTON(vbox, regexp_checkbtn, _("Use regexp"));
gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
@@ -754,12 +754,12 @@ static void prefs_matcher_create(void)
GTK_FILL, GTK_SHRINK, 4, 0);
/* Date widgets */
- date_vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ date_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
calendar = gtk_calendar_new();
gtk_box_pack_start(GTK_BOX(hbox), calendar, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(lower_hbox), date_vbox, FALSE, FALSE, 0);
- date_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ date_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(date_vbox), date_hbox, FALSE, FALSE, 0);
time_entry = gtkut_time_select_combo_new();
@@ -777,14 +777,14 @@ static void prefs_matcher_create(void)
window);
/* register / substitute / delete */
- reg_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(vbox1), reg_hbox, FALSE, FALSE, 0);
arrow = gtk_image_new_from_icon_name("pan-down-symbolic", GTK_ICON_SIZE_MENU);
gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
gtk_widget_set_size_request(arrow, -1, 16);
- btn_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
reg_btn = gtkut_stock_button("list-add");
@@ -803,7 +803,7 @@ static void prefs_matcher_create(void)
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_matcher_delete_cb), NULL);
- cond_hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ cond_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_box_pack_start(GTK_BOX(vbox1), cond_hbox, TRUE, TRUE, 0);
cond_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
@@ -819,7 +819,7 @@ static void prefs_matcher_create(void)
GTK_SHADOW_ETCHED_IN);
gtk_container_add(GTK_CONTAINER(cond_scrolledwin), cond_list_view);
- btn_vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
up_btn = gtkut_stock_button("go-up");
@@ -833,7 +833,7 @@ static void prefs_matcher_create(void)
G_CALLBACK(prefs_matcher_down), NULL);
/* boolean operation */
- GtkWidget *hbox_bool = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ GtkWidget *hbox_bool = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(vbox1), hbox_bool, FALSE, FALSE, 0);
bool_op_label = gtk_label_new(_("Message must match"));
diff --git a/src/prefs_message.c b/src/prefs_message.c
index a1b26b8be..e255090dc 100644
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -112,7 +112,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *entry_quote_chars;
GtkWidget *label_quote_chars;
- 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);
@@ -135,7 +135,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
g_signal_connect(G_OBJECT(checkbtn_disphdrpane), "toggled",
G_CALLBACK(disphdr_pane_toggled), checkbtn_dispxface);
- 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, TRUE, 0);
@@ -163,11 +163,11 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON(vbox2, checkbtn_promote_html_part,
_("Select the HTML part of multipart/alternative messages"));
- hbox1 = gtk_hbox_new (FALSE, 32);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
- hbox_linespc = gtk_hbox_new (FALSE, 8);
+ hbox_linespc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (hbox1), hbox_linespc, FALSE, TRUE, 0);
@@ -194,13 +194,13 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON(vbox_scr, checkbtn_halfpage, _("Half page"));
- hbox1 = gtk_hbox_new (FALSE, 32);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_scr), hbox1, FALSE, TRUE, 0);
PACK_CHECK_BUTTON(hbox1, checkbtn_smoothscroll, _("Smooth scroll"));
- hbox_scr = gtk_hbox_new (FALSE, 8);
+ hbox_scr = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_scr);
gtk_box_pack_start (GTK_BOX (hbox1), hbox_scr, FALSE, FALSE, 0);
@@ -229,17 +229,17 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
/* quote chars */
PACK_FRAME (vbox1, frame_quote, _("Quotation"));
- vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_quote = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_widget_show (vbox_quote);
gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
- hbox1 = gtk_hbox_new (FALSE, 32);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 32);
gtk_widget_show (hbox1);
PACK_CHECK_BUTTON(vbox_quote, checkbtn_hide_quoted, _("Collapse quoted text on double click"));
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 78afb79c9..79eb8e379 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -144,7 +144,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- vbox1 = gtk_vbox_new (FALSE, VBOX_BORDER);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
@@ -152,18 +152,18 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
vbox2 = gtkut_get_options_frame(vbox1, &frame_msg, _("Message view"));
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
PACK_CHECK_BUTTON (hbox, checkbtn_enable_colors,
_("Enable coloration of message text"));
- hbox_quote = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox_quote = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox_quote);
- vbox_quotefg = gtk_vbox_new(FALSE, VBOX_BORDER);
+ vbox_quotefg = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_widget_show (vbox_quotefg);
- vbox_quotebg = gtk_vbox_new(FALSE, VBOX_BORDER);
+ vbox_quotebg = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_widget_show (vbox_quotebg);
vbox3 = gtkut_get_options_frame(vbox2, &frame_quote, _("Quote"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, frame_quote);
@@ -172,7 +172,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotefg, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotebg, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
@@ -183,7 +183,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
CLAWS_SET_TIP(checkbtn_recycle_colors,
_("If there are more than 3 quote levels, the colors will be reused"));
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
@@ -201,7 +201,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors,
color_buttons.color[COL_QUOTE_LEVEL1]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
@@ -219,7 +219,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors,
color_buttons.color[COL_QUOTE_LEVEL2]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
@@ -237,7 +237,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors,
color_buttons.color[COL_QUOTE_LEVEL3]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
@@ -245,7 +245,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
_("Enable coloration of text background"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, checkbtn_enable_bgcolors);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
@@ -258,7 +258,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_QUOTE_LEVEL1_BG, _("Background"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label[COL_QUOTE_LEVEL1_BG]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
@@ -271,7 +271,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_QUOTE_LEVEL2_BG, _("Background"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label[COL_QUOTE_LEVEL2_BG]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
@@ -284,7 +284,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_QUOTE_LEVEL3_BG, _("Background"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label[COL_QUOTE_LEVEL3_BG]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
@@ -296,7 +296,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_URI, _("URI link"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label[COL_URI]);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
@@ -314,7 +314,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
_("Patch messages and attachments"));
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, frame_diff);
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, TRUE, 0);
@@ -323,7 +323,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_DIFF_ADDED, _("Inserted lines"));
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
@@ -333,7 +333,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_DIFF_DELETED,
_("Removed lines"));
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
@@ -347,7 +347,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
vbox2 = gtkut_get_options_frame(vbox1, &frame_folder, _("Folder list"));
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
@@ -359,7 +359,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_LABEL_PACK_START(hbox, COL_TGT_FOLDER, _("Target folder"));
- hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
@@ -371,22 +371,22 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
_("Folder containing new messages"));
/* custom colors */
- vbox_custom_colors = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_custom_colors = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_widget_show (vbox_custom_colors);
gtk_container_set_border_width (GTK_CONTAINER (vbox_custom_colors), VBOX_BORDER);
gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), vbox_custom_colors,
gtk_label_new(_("Color labels")));
- hbox_custom_colors = gtk_hbox_new(FALSE, 8);
+ hbox_custom_colors = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox_custom_colors);
gtk_box_pack_start(GTK_BOX (vbox_custom_colors), hbox_custom_colors,
FALSE, TRUE, 0);
- vbox_custom_colors1 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_custom_colors1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_widget_show (vbox_custom_colors1);
gtk_box_pack_start (GTK_BOX (hbox_custom_colors), vbox_custom_colors1, FALSE, FALSE, 0);
- vbox_custom_colors2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_custom_colors2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_widget_show (vbox_custom_colors2);
gtk_box_pack_start (GTK_BOX (hbox_custom_colors), vbox_custom_colors2, FALSE, FALSE, 0);
@@ -399,7 +399,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
rule name and should not be translated */
tooltip_entry_text = g_strdup_printf(_("Set label for 'color %d'"), c+1);
- hbox_custom_color[c] = gtk_hbox_new(FALSE, 8);
+ hbox_custom_color[c] = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox_custom_color[c]);
gtk_box_pack_start(GTK_BOX (vbox_custom_colors1), hbox_custom_color[c],
FALSE, TRUE, 0);
@@ -431,7 +431,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
rule name and should not be translated */
tooltip_entry_text = g_strdup_printf(_("Set label for 'color %d'"), c+1);
- hbox_custom_color[c] = gtk_hbox_new(FALSE, 8);
+ hbox_custom_color[c] = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox_custom_color[c]);
gtk_box_pack_start(GTK_BOX (vbox_custom_colors2), hbox_custom_color[c],
FALSE, TRUE, 0);
@@ -454,7 +454,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
g_free(tooltip_entry_text);
}
- hbox_reset_custom_colors = gtk_hbox_new(FALSE, VBOX_BORDER);
+ hbox_reset_custom_colors = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show (hbox_reset_custom_colors);
gtk_box_pack_start(GTK_BOX (vbox_custom_colors), hbox_reset_custom_colors,
FALSE, FALSE, 0);
diff --git a/src/prefs_other.c b/src/prefs_other.c
index 30e6b4113..61f5c4ae6 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -113,11 +113,11 @@ static void prefs_keybind_select(void)
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
manage_window_set_transient (GTK_WINDOW (window));
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_container_add (GTK_CONTAINER (window), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
label = gtk_label_new
@@ -132,7 +132,7 @@ static void prefs_keybind_select(void)
NULL);
gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
label = gtk_label_new
@@ -143,7 +143,7 @@ static void prefs_keybind_select(void)
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtkut_widget_set_small_font_size (label);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
gtkut_stock_button_set_create (&confirm_area, &cancel_btn, _("_Cancel"),
@@ -486,7 +486,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
gchar *shred_binary = 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);
@@ -502,7 +502,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (vbox_exit, checkbtn_confonexit,
_("Confirm on exit"));
- hbox1 = gtk_hbox_new (FALSE, 32);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_exit), hbox1, FALSE, FALSE, 0);
@@ -530,7 +530,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
button_keybind = gtk_button_new_with_label(
_(" Choose preset keyboard shortcuts... "));
gtk_widget_show (button_keybind);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_keys), hbox1, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox1), button_keybind, FALSE, FALSE, 0);
@@ -547,7 +547,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
flush_metadata_safer_radiobtn = gtk_radio_button_new_with_label(NULL, _("Safer"));
flush_metadata_faster_radiobtn = gtk_radio_button_new_with_label_from_widget(
GTK_RADIO_BUTTON(flush_metadata_safer_radiobtn), _("Faster"));
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_metadata), hbox1, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox1), flush_metadata_safer_radiobtn, FALSE, FALSE, 0);
@@ -560,7 +560,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show_all(frame_metadata);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
@@ -580,7 +580,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show (label_iotimeout);
gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
- vbox2 = gtk_vbox_new (FALSE, 8);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
@@ -626,7 +626,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
button_change_passphrase = gtk_button_new_with_label(
_("Change master passphrase"));
gtk_widget_show (button_change_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 (vbox_passphrase), hbox1, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox1), button_change_passphrase,
diff --git a/src/prefs_proxy.c b/src/prefs_proxy.c
index 617938ba9..53caec2a5 100644
--- a/src/prefs_proxy.c
+++ b/src/prefs_proxy.c
@@ -67,18 +67,18 @@ static void prefs_proxy_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *table;
gchar *buf;
- vbox0 = gtk_vbox_new(FALSE, VSPACING);
+ vbox0 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_container_set_border_width(GTK_CONTAINER(vbox0), VBOX_BORDER);
proxy_checkbtn = gtk_check_button_new_with_label(_("Use proxy server"));
PACK_FRAME(vbox0, proxy_frame, NULL);
gtk_frame_set_label_widget(GTK_FRAME(proxy_frame), proxy_checkbtn);
- vbox1 = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 8);
gtk_container_add(GTK_CONTAINER(proxy_frame), vbox1);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
socks4_radiobtn = gtk_radio_button_new_with_label(NULL, "SOCKS4");
@@ -92,7 +92,7 @@ static void prefs_proxy_create_widget(PrefsPage *_page, GtkWindow *window,
g_object_set_data(G_OBJECT(socks5_radiobtn), MENU_VAL_ID,
GINT_TO_POINTER(PROXY_SOCKS5));
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
label = gtk_label_new(_("Hostname"));
@@ -109,7 +109,7 @@ static void prefs_proxy_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_set_size_request(proxy_port_spinbtn, 64, -1);
gtk_box_pack_start(GTK_BOX(hbox), proxy_port_spinbtn, FALSE, FALSE, 0);
- vbox2 = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_box_pack_start(GTK_BOX(vbox1), vbox2, FALSE, FALSE, 0);
PACK_CHECK_BUTTON(vbox2, proxy_auth_checkbtn, _("Use authentication"));
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
index 460d36544..a973fbc1d 100644
--- a/src/prefs_quote.c
+++ b/src/prefs_quote.c
@@ -96,7 +96,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *vbox2;
GtkWidget *notebook;
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
notebook = gtk_notebook_new();
@@ -104,7 +104,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
/* new message */
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
@@ -119,7 +119,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
/* reply */
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
@@ -134,7 +134,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Reply")));
/* forward */
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index 68b7dede7..bacec9df1 100644
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -137,7 +137,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *checkbtn_no_recv_err_panel;
GtkWidget *checkbtn_close_recv_dialog;
- 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);
@@ -147,7 +147,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (vbox2, checkbtn_incext,
_("Use external program for receiving mail"));
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY (checkbtn_incext, hbox);
@@ -163,7 +163,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
/* Auto-checking */
vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Automatic checking"));
- hbox_autochk = gtk_hbox_new (FALSE, 8);
+ hbox_autochk = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_autochk);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0);
@@ -230,7 +230,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
COMBOBOX_ADD (menu, _("Only on manual receiving"), RECV_DIALOG_MANUAL);
COMBOBOX_ADD (menu, _("Never"), RECV_DIALOG_NEVER);
- hbox = gtk_hbox_new(FALSE, 20);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 20);
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(hbox), label_recvdialog, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), optmenu_recvdialog, FALSE, FALSE, 0);
@@ -252,7 +252,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
vbox3 = gtkut_get_options_frame(vbox2, &frame, _("Run command"));
- hbox = gtk_hbox_new (TRUE, 8);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
PACK_CHECK_BUTTON (hbox, checkbtn_newmail_auto,
_("after automatic check"));
@@ -260,7 +260,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
_("after manual check"));
gtk_box_pack_start (GTK_BOX(vbox3), hbox, FALSE, FALSE, 0);
- hbox_newmail_notify = gtk_hbox_new (FALSE, 8);
+ hbox_newmail_notify = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_newmail_notify);
gtk_box_pack_start (GTK_BOX (vbox3), hbox_newmail_notify, FALSE,
FALSE, 0);
diff --git a/src/prefs_send.c b/src/prefs_send.c
index 0b9086e4a..ff50f3a54 100644
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -164,12 +164,12 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *spinbtn_warn_multiple_recipients;
GtkWidget *table;
- 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);
/* messages frame */
- vbox2 = gtk_vbox_new (FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox2);
PACK_CHECK_BUTTON(vbox2, checkbtn_savemsg,
@@ -190,7 +190,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_container_add(GTK_CONTAINER(frame), vbox2);
/* interface frame */
- vbox2 = gtk_vbox_new (FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox2);
PACK_CHECK_BUTTON(vbox2, checkbtn_confirm_send_queued_messages,
@@ -202,7 +202,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON(vbox2, checkbtn_warn_empty_subj,
_("Warn when Subject is empty"));
- hbox1 = gtk_hbox_new (FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox1);
PACK_CHECK_BUTTON(hbox1, checkbtn_warn_multiple_recipients,
diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index 9c596bf8a..1815c738c 100644
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -116,11 +116,11 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
GtkWidget *misspelled_hbox;
GtkWidget *misspelled_colorbtn;
- 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);
@@ -197,7 +197,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
gtk_table_attach (GTK_TABLE (table), get_dictionaries_btn, 1, 2, 3, 4,
GTK_SHRINK, 0, 0, 0);
#endif
- misspelled_hbox = gtk_hbox_new(FALSE, 10);
+ misspelled_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show(misspelled_hbox);
gtk_box_pack_start(GTK_BOX(vbox1), misspelled_hbox, FALSE, FALSE, 0);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 60518b2d7..45bcc9560 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -208,7 +208,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
gtk_window_set_type_hint(GTK_WINDOW(datefmt_win), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_widget_set_size_request(datefmt_win, 440, 280);
- vbox1 = gtk_vbox_new(FALSE, 10);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_widget_show(vbox1);
gtk_container_add(GTK_CONTAINER(datefmt_win), vbox1);
@@ -373,13 +373,13 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- 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);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
gtk_label_new(_("Folder list")));
- hbox0 = gtk_hbox_new (FALSE, 8);
+ hbox0 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox0, FALSE, TRUE, 0);
@@ -393,7 +393,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
G_CALLBACK (prefs_folder_column_open),
NULL);
- hbox0 = gtk_hbox_new (FALSE, 8);
+ hbox0 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox0);
gtk_box_pack_start(GTK_BOX (vbox1), hbox0, FALSE, FALSE, 0);
@@ -416,7 +416,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
(vbox1, checkbtn_reopen_last_folder,
_("Open last opened folder at start-up"));
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start(GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
@@ -438,13 +438,13 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show (label_ng_abbrev);
gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
- 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);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
gtk_label_new(_("Message list")));
- hbox0 = gtk_hbox_new (FALSE, 8);
+ hbox0 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox0, FALSE, TRUE, 0);
@@ -461,7 +461,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_SPACER(hbox0, hbox1, 4);
PACK_CHECK_BUTTON(hbox0, checkbtn_summary_col_lock, _("Lock column headers"));
- hbox1 = gtk_hbox_new (FALSE, 10);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
@@ -479,7 +479,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
COMBOBOX_ADD (menu, _("Name and Address"), SHOW_BOTH);
gtk_box_pack_start(GTK_BOX(hbox1), optmenu_summaryfromshow, FALSE, FALSE, 0);
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, TRUE, 0);
@@ -504,7 +504,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
CLAWS_SET_TIP(button_datefmt,
_("Date format help"));
- hbox1 = gtk_hbox_new (FALSE, 10);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
@@ -537,7 +537,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
radio_mark_as_read_on_select = gtk_radio_button_new_with_label(NULL,
_("when selected, after"));
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_box_pack_start (GTK_BOX (hbox1), radio_mark_as_read_on_select, FALSE, FALSE, 0);
spinbtn_mark_as_read_delay_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 60, 1, 10, 0));
@@ -560,7 +560,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show_all(vbox3);
/* Next Unread Message Dialog */
- hbox1 = gtk_hbox_new (FALSE, 10);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
@@ -605,11 +605,11 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
(vbox1, checkbtn_show_tooltips,
_("Show tooltips"));
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
- 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);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
@@ -617,7 +617,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
vbox2 = gtkut_get_options_frame(vbox1, &frame_new_folders, _("New folders"));
- hbox1 = gtk_hbox_new(FALSE, 10);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 7fe189030..d0c6eebdf 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -231,11 +231,11 @@ static void prefs_summary_column_create(void)
G_CALLBACK(prefs_summary_column_key_pressed),
NULL);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- label_hbox = gtk_hbox_new(FALSE, 0);
+ label_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(label_hbox);
gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
@@ -246,16 +246,16 @@ static void prefs_summary_column_create(void)
gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- vbox1 = gtk_vbox_new(FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
- hbox1 = gtk_hbox_new(FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, TRUE, 0);
- clist_hbox = gtk_hbox_new(FALSE, 8);
+ clist_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(clist_hbox);
gtk_box_pack_start(GTK_BOX(hbox1), clist_hbox, TRUE, TRUE, 0);
@@ -278,7 +278,7 @@ static void prefs_summary_column_create(void)
gtk_container_add(GTK_CONTAINER(scrolledwin), stock_list_view);
/* add/remove button */
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
@@ -296,7 +296,7 @@ static void prefs_summary_column_create(void)
g_signal_connect(G_OBJECT(remove_btn), "clicked",
G_CALLBACK(prefs_summary_column_remove), NULL);
- clist_hbox = gtk_hbox_new(FALSE, 8);
+ clist_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(clist_hbox);
gtk_box_pack_start(GTK_BOX(hbox1), clist_hbox, TRUE, TRUE, 0);
@@ -319,7 +319,7 @@ static void prefs_summary_column_create(void)
gtk_container_add(GTK_CONTAINER(scrolledwin), shown_list_view);
/* up/down button */
- btn_vbox = gtk_vbox_new(FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
@@ -336,11 +336,11 @@ static void prefs_summary_column_create(void)
g_signal_connect(G_OBJECT(down_btn), "clicked",
G_CALLBACK(prefs_summary_column_down), NULL);
- btn_hbox = gtk_hbox_new(FALSE, 8);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(btn_hbox);
gtk_box_pack_end(GTK_BOX(vbox), btn_hbox, FALSE, FALSE, 0);
- btn_vbox = gtk_vbox_new(FALSE, 0);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(btn_hbox), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index 49507ddd1..9c6f2b3b2 100644
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -170,11 +170,11 @@ static void prefs_summary_open_create(void)
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_widget_set_size_request (GTK_WIDGET (window), 610, 310);
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
- btn_hbox = gtk_hbox_new (FALSE, 8);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (btn_hbox);
gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0);
@@ -200,22 +200,22 @@ static void prefs_summary_open_create(void)
G_CALLBACK(prefs_summary_open_cancel),
NULL);
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
/* display headers list */
- list_view_hbox = gtk_hbox_new (FALSE, 10);
+ list_view_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show (list_view_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), list_view_hbox, TRUE, TRUE, 0);
- list_view_hbox1 = gtk_hbox_new (FALSE, 8);
+ list_view_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (list_view_hbox1);
gtk_box_pack_start (GTK_BOX (list_view_hbox), list_view_hbox1, TRUE, TRUE, 0);
@@ -234,7 +234,7 @@ static void prefs_summary_open_create(void)
gtk_widget_show (possible_actions_list_view);
gtk_container_add(GTK_CONTAINER(list_view_scrolledwin), possible_actions_list_view);
- btn_vbox = gtk_vbox_new (FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox1), btn_vbox, FALSE, FALSE, 0);
@@ -250,7 +250,7 @@ static void prefs_summary_open_create(void)
/* actions list */
- list_view_hbox2 = gtk_hbox_new (FALSE, 8);
+ list_view_hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (list_view_hbox2);
gtk_box_pack_start (GTK_BOX (list_view_hbox), list_view_hbox2, TRUE, TRUE, 0);
@@ -282,7 +282,7 @@ static void prefs_summary_open_create(void)
G_CALLBACK(drag_end),
actions_list_view);
- btn_vbox = gtk_vbox_new (FALSE, 8);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 87c773530..7f0b0db03 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -195,7 +195,7 @@ static void prefs_template_window_create(void)
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new(FALSE, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
@@ -214,7 +214,7 @@ static void prefs_template_window_create(void)
gtk_bin_get_child(GTK_BIN(scrolled_window))), GTK_SHADOW_NONE);
/* vbox to handle template name and content */
- vbox1 = gtk_vbox_new(FALSE, 6);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox1);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 8);
gtk_paned_pack1(GTK_PANED(vpaned), vbox1, FALSE, FALSE);
@@ -280,13 +280,13 @@ static void prefs_template_window_create(void)
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_value), GTK_WRAP_WORD);
/* vbox for buttons and templates list */
- vbox2 = gtk_vbox_new(FALSE, 6);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(vbox2);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
gtk_paned_pack2(GTK_PANED(vpaned), vbox2, TRUE, FALSE);
/* register | substitute | delete */
- hbox2 = gtk_hbox_new(FALSE, 4);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(hbox2);
gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 0);
@@ -294,7 +294,7 @@ static void prefs_template_window_create(void)
gtk_widget_show(arrow1);
gtk_box_pack_start(GTK_BOX(hbox2), arrow1, FALSE, FALSE, 0);
- hbox3 = gtk_hbox_new(TRUE, 4);
+ hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(hbox3);
gtk_box_pack_start(GTK_BOX(hbox2), hbox3, FALSE, FALSE, 0);
@@ -340,7 +340,7 @@ static void prefs_template_window_create(void)
_("Show information on configuring templates"));
/* templates list */
- hbox4 = gtk_hbox_new(FALSE, 8);
+ hbox4 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox4);
gtk_box_pack_start(GTK_BOX(vbox2), hbox4, TRUE, TRUE, 0);
@@ -351,7 +351,7 @@ static void prefs_template_window_create(void)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- vbox3 = gtk_vbox_new(FALSE, 8);
+ vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(vbox3);
gtk_box_pack_start(GTK_BOX(hbox4), vbox3, FALSE, FALSE, 0);
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 7ab688952..6b94e33df 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -949,13 +949,13 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
GtkAdjustment *spinbtn_scaling_ppi_adj;
#endif
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 5);
gtk_widget_show (vbox1);
vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("Selector"));
- hbox3 = gtk_hbox_new (FALSE, 5);
+ hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0);
// gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5);
@@ -1048,7 +1048,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
PACK_FRAME(vbox1, frame_preview, _("Preview"));
- hbox1 = gtk_hbox_new (FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox1);
gtk_container_add (GTK_CONTAINER (frame_preview), hbox1);
gtk_container_set_border_width (GTK_CONTAINER (hbox1), 5);
@@ -1112,7 +1112,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
#ifdef HAVE_SVG
PACK_FRAME(vbox1, frame_scaling, _("SVG rendering"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 5);
gtk_container_add (GTK_CONTAINER (frame_scaling), vbox2);
@@ -1121,7 +1121,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
PACK_CHECK_BUTTON(vbox2, checkbtn_enable_scaling, _("Force scaling"));
PACK_CHECK_BUTTON(vbox2, checkbtn_scaling_auto, _("Automatic"));
- hbox3 = gtk_hbox_new (FALSE, 5);
+ hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_show (hbox3);
label_scaling_ppi = gtk_label_new (_("Pixels per inch (PPI)"));
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 4296cc6ce..f710e8212 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -890,14 +890,14 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
debug_print("Creating custom toolbar window...\n");
- main_vbox = gtk_vbox_new(FALSE, 0);
+ main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(main_vbox);
PACK_FRAME (main_vbox, vbox_frame, _("Toolbar item"))
gtk_container_set_border_width(GTK_CONTAINER(vbox_frame), 8);
gtk_widget_show(vbox_frame);
- toolbar_item_hbox = gtk_hbox_new (FALSE, 4);
+ toolbar_item_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(toolbar_item_hbox);
gtk_container_add(GTK_CONTAINER (vbox_frame), toolbar_item_hbox);
@@ -968,14 +968,14 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- icon_vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
+ icon_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_widget_show(icon_vbox);
icon_label = gtk_label_new(_("Icon"));
gtk_widget_set_size_request(icon_label, 100, -1);
gtk_box_pack_start(GTK_BOX(icon_vbox), icon_label, FALSE, FALSE, 0);
- icon_hbox = gtk_hbox_new(FALSE, 0);
+ icon_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(icon_hbox);
label = gtk_label_new("");
@@ -996,7 +996,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
gtk_box_pack_start(GTK_BOX(toolbar_item_hbox), icon_vbox, FALSE, FALSE, 0);
/* register / substitute / delete */
- reg_hbox = gtk_hbox_new(FALSE, 4);
+ reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(main_vbox), reg_hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(reg_hbox), 10);
@@ -1004,7 +1004,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
gtk_widget_set_size_request(arrow, -1, 16);
- btn_hbox = gtk_hbox_new(TRUE, 4);
+ btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
reg_btn = gtkut_stock_button("list-add");
@@ -1029,7 +1029,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
#ifndef GENERIC_UMPC
gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
#else
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), default_btn, FALSE, FALSE, 0);
#endif
@@ -1038,10 +1038,10 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
prefs_toolbar);
/* currently active toolbar items */
- vbox_toolbar_items = gtk_vbox_new(FALSE, VBOX_BORDER);
+ vbox_toolbar_items = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
gtk_box_pack_start(GTK_BOX(main_vbox), vbox_toolbar_items, TRUE, TRUE, 0);
- hbox_bottom = gtk_hbox_new(FALSE, 0);
+ hbox_bottom = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add(GTK_CONTAINER(vbox_toolbar_items), hbox_bottom);
scrolledwindow_list_view_set = gtk_scrolled_window_new(NULL, NULL);
@@ -1057,7 +1057,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_set), list_view_set);
gtk_widget_set_size_request(list_view_set, 225, 120);
- btn_vbox = gtk_vbox_new(FALSE, 0);
+ btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox_bottom), btn_vbox, FALSE, FALSE, 0);
diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
index 0134cd94a..c7e998703 100644
--- a/src/prefs_wrapping.c
+++ b/src/prefs_wrapping.c
@@ -69,11 +69,11 @@ static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *checkbtn_autoindent;
GtkWidget *hbox1;
- 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);
@@ -82,7 +82,7 @@ static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (vbox2, checkbtn_wrappastes, _("Wrap pasted text"));
PACK_CHECK_BUTTON (vbox2, checkbtn_autoindent, _("Auto indent"));
- 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);
diff --git a/src/printing.c b/src/printing.c
index f811dbce0..16f120e93 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -409,7 +409,7 @@ static gboolean cb_preview(GtkPrintOperation *operation,
GtkToolItem *separator;
static GdkGeometry geometry;
GtkWidget *dialog = NULL;
- GtkWidget *statusbar = gtk_hbox_new(2, FALSE);
+ GtkWidget *statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
debug_print("Creating internal print preview\n");
@@ -435,7 +435,7 @@ static gboolean cb_preview(GtkPrintOperation *operation,
gtk_window_set_title(GTK_WINDOW(dialog), _("Print preview"));
/* vbox */
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(dialog), vbox);
/* toolbar */
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index b014ac9b7..8a26135de 100644
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -125,7 +125,7 @@ static void quote_fmt_add_buttons(GtkWindow* parent_window, GtkWidget *parent_bo
if (!add_info_button && !set_defaults_func)
return;
- hbox_btns = gtk_hbox_new(FALSE, 0);
+ hbox_btns = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end (GTK_BOX(parent_box), hbox_btns, FALSE, TRUE, 0);
if (add_info_button)
@@ -172,13 +172,13 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
_("Use template when composing new messages"));
- vbox_format = gtk_vbox_new (FALSE, 4);
+ vbox_format = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_format);
gtk_container_add(GTK_CONTAINER (parent_box), vbox_format);
gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
if (override_from_format) {
- hbox2_format = gtk_hbox_new (FALSE, 8);
+ hbox2_format = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0);
@@ -196,7 +196,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
_("Override From header. This doesn't change the account used to compose the new message."));
}
- hbox_format = gtk_hbox_new (FALSE, 8);
+ hbox_format = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox_format, FALSE, FALSE, 0);
@@ -295,13 +295,13 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
_("Use template when replying to messages"));
- vbox_quote = gtk_vbox_new (FALSE, 4);
+ vbox_quote = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_quote);
gtk_container_add(GTK_CONTAINER (parent_box), vbox_quote);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
if (override_from_format) {
- hbox3 = gtk_hbox_new (FALSE, 8);
+ hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
@@ -319,11 +319,11 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
_("Override From header. This doesn't change the account used to reply."));
}
- hbox1 = gtk_hbox_new (FALSE, 32);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
@@ -423,13 +423,13 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
_("Use template when forwarding messages"));
- vbox_quote = gtk_vbox_new (FALSE, 4);
+ vbox_quote = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_quote);
gtk_container_add(GTK_CONTAINER (parent_box), vbox_quote);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
if (override_from_format) {
- hbox3 = gtk_hbox_new (FALSE, 8);
+ hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
@@ -447,11 +447,11 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
_("Override From header. This doesn't change the account used to forward."));
}
- hbox1 = gtk_hbox_new (FALSE, 32);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
- hbox2 = gtk_hbox_new (FALSE, 8);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index b23e639f0..f8363654f 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -206,8 +206,8 @@ void ssl_manager_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
- hbox1 = gtk_hbox_new(FALSE, 6);
- vbox1 = gtk_vbox_new(FALSE, 0);
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
delete_btn = gtkut_stock_button("edit-delete");
g_signal_connect(G_OBJECT(delete_btn), "clicked",
diff --git a/src/statusbar.c b/src/statusbar.c
index 68070cead..a6290cffe 100644
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -52,7 +52,7 @@ GtkWidget *statusbar_create(void)
child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
parent = gtk_widget_get_parent(child);
gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add(GTK_CONTAINER(parent), hbox);
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(hbox), child, TRUE, TRUE, 0);
diff --git a/src/summary_search.c b/src/summary_search.c
index a787d7ffe..98a057ffd 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -298,11 +298,11 @@ static void summary_search_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox1 = gtk_vbox_new (FALSE, 0);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (window), vbox1);
- bool_hbox = gtk_hbox_new(FALSE, 4);
+ bool_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show(bool_hbox);
gtk_box_pack_start(GTK_BOX(vbox1), bool_hbox, FALSE, FALSE, 0);
@@ -448,7 +448,7 @@ static void summary_search_create(void)
gtk_label_set_justify (GTK_LABEL (adv_condition_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_xalign (GTK_LABEL (adv_condition_label), 1.0);
- checkbtn_hbox = gtk_hbox_new (FALSE, 8);
+ checkbtn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (checkbtn_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), checkbtn_hbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (checkbtn_hbox), 8);
diff --git a/src/summaryview.c b/src/summaryview.c
index 9c40eebab..1784517b9 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -569,19 +569,19 @@ SummaryView *summary_create(MainWindow *mainwin)
summaryview = g_new0(SummaryView, 1);
#define SUMMARY_VBOX_SPACING 3
- vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, SUMMARY_VBOX_SPACING);
/* create status label */
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox);
- stat_vbox = gtk_vbox_new(FALSE, 0);
+ stat_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(stat_vbox);
- stat_box = gtk_hbox_new(FALSE, 0);
+ stat_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(stat_box);
- stat_box2 = gtk_hbox_new(FALSE, 0);
+ stat_box2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(stat_box2);
toggle_search = gtk_toggle_button_new();
@@ -598,7 +598,7 @@ SummaryView *summary_create(MainWindow *mainwin)
gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box2, TRUE, TRUE, 0);
- hbox_l = gtk_hbox_new(FALSE, 0);
+ hbox_l = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox_l);
gtk_box_pack_start(GTK_BOX(stat_box), hbox_l, TRUE, TRUE, 0);
@@ -637,7 +637,7 @@ SummaryView *summary_create(MainWindow *mainwin)
gtk_widget_show(statlabel_msgs);
gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, 4);
- hbox_spc = gtk_hbox_new(FALSE, 0);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox_spc);
gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
@@ -2890,7 +2890,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
continue;
}
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
label = gtk_label_new(title);
#ifdef GENERIC_UMPC
gtk_widget_set_size_request(hbox, -1, 20);
@@ -5758,7 +5758,7 @@ static gboolean summary_filter_get_mode(void)
GtkWidget *account_rules_user_current;
AlertValue val;
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
account_rules_skip = gtk_radio_button_new_with_label
(NULL, _("Skip these rules"));
diff --git a/src/textview.c b/src/textview.c
index d8d18cc5b..d5a578266 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -313,7 +313,7 @@ TextView *textview_create(void)
gtk_widget_show(scrolledwin);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_show(vbox);
diff --git a/src/uri_opener.c b/src/uri_opener.c
index bdd1b8783..5f7d8e9fa 100644
--- a/src/uri_opener.c
+++ b/src/uri_opener.c
@@ -198,7 +198,7 @@ static void uri_opener_create(void)
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
- vbox1 = gtk_vbox_new(FALSE, 6);
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtkut_stock_button_set_create(&hbox1,
&open_btn, "document-open",
&close_btn, "window-close",
@@ -217,14 +217,14 @@ static void uri_opener_create(void)
gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0);
scrolledwin = uri_opener_scrolled_win_create();
- hbox_scroll = gtk_hbox_new(FALSE, 0);
+ hbox_scroll = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox_scroll), scrolledwin, TRUE, TRUE, 0);
select_all_btn = gtk_button_new_with_label(_("Select All"));
g_signal_connect(G_OBJECT(select_all_btn), "clicked",
G_CALLBACK(uri_opener_select_all_cb), NULL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), select_all_btn, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
diff --git a/src/wizard.c b/src/wizard.c
index e75f74492..791a03fc1 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -844,11 +844,11 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
GtkWidget *image;
char *title_string;
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER(vbox), 10);
/* create the titlebar */
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
image = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_ICON);
gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 0);
title_string = g_strconcat ("<span size=\"xx-large\" weight=\"ultrabold\">", title ? title : "", "</span>", NULL);
@@ -962,7 +962,7 @@ static GtkWidget* user_page (WizardWindow * wizard)
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
@@ -1018,13 +1018,13 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->mailbox_label = gtk_label_new(g_strconcat("<span weight=\"bold\">",
@@ -1092,13 +1092,13 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_server = gtk_entry_new();
text = get_default_server(wizard, "smtp");
@@ -1112,7 +1112,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
PACK_BOX(hbox, g_strconcat("<span weight=\"bold\">", _("SMTP server address:"),
"</span>", NULL), wizard->smtp_server);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_auth = gtk_check_button_new_with_label(
_("Use authentication"));
@@ -1129,9 +1129,9 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, label);
gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
smtp_auth_table = gtk_table_new(2, 2, FALSE);
@@ -1159,7 +1159,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password, 1,2,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
#ifdef USE_GNUTLS
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_use_ssl = gtk_check_button_new_with_label(
_("Use SSL/TLS to connect to SMTP server"));
@@ -1167,9 +1167,9 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
tmpl.smtpssl != 0);
gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_use_ssl, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
wizard->smtp_use_tls = gtk_check_button_new_with_label(
@@ -1181,16 +1181,16 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
smtp_cert_table = gtk_table_new(3,3, FALSE);
gtk_box_pack_start (GTK_BOX(vbox), smtp_cert_table, FALSE, FALSE, 4);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Client SSL/TLS certificate (optional)"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("File"));
@@ -1207,8 +1207,8 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(cert_browse_cb), wizard->smtp_ssl_cert_file);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Password"));
@@ -1476,7 +1476,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VSPACING_NARROW_2);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
@@ -1579,7 +1579,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password, 1,2,4,5,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
#ifdef USE_GNUTLS
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->recv_use_ssl = gtk_check_button_new_with_label(
_("Use SSL/TLS to connect to receiving server"));
@@ -1587,9 +1587,9 @@ static GtkWidget* recv_page (WizardWindow * wizard)
tmpl.recvssl != 0);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_use_ssl, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
wizard->recv_use_tls = gtk_check_button_new_with_label(
@@ -1601,16 +1601,16 @@ static GtkWidget* recv_page (WizardWindow * wizard)
recv_cert_table = gtk_table_new(3,3, FALSE);
gtk_box_pack_start (GTK_BOX(vbox), recv_cert_table, FALSE, FALSE, 4);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Client SSL/TLS certificate (optional)"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("File"));
@@ -1627,8 +1627,8 @@ static GtkWidget* recv_page (WizardWindow * wizard)
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(cert_browse_cb), wizard->recv_ssl_cert_file);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Password"));
@@ -1643,7 +1643,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, recv_cert_table);
wizard->recv_cert_table = recv_cert_table;
#endif
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->recv_imap_subdir = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->recv_imap_subdir), tmpl.imapdir?tmpl.imapdir:"");
@@ -1652,9 +1652,9 @@ static GtkWidget* recv_page (WizardWindow * wizard)
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_subdir, TRUE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- hbox_spc = gtk_hbox_new (FALSE, 0);
+ hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
wizard->subsonly_checkbtn = gtk_check_button_new_with_label(
@@ -1663,7 +1663,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
tmpl.subsonly);
gtk_box_pack_start(GTK_BOX(hbox), wizard->subsonly_checkbtn, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->no_imap_warning = gtk_label_new(g_strconcat("<span weight=\"bold\">",
_("Warning: this version of Claws Mail\n"
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list