[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-72-g1f5a512
ticho at claws-mail.org
ticho at claws-mail.org
Mon Feb 12 21:38:02 CET 2018
The branch, gtk3 has been updated
via 1f5a512b8539864f17ebdff70e4a2bb3dd7c1ca1 (commit)
from 40e5f41effe9afed9933b37408fa8e611b07403c (commit)
Summary of changes:
configure.ac | 2 +-
src/addrduplicates.c | 4 ++--
src/addressbook.c | 4 ++--
src/mainwindow.c | 14 +++++++-------
src/mimeview.c | 2 +-
src/plugins/pdf_viewer/poppler_viewer.c | 2 +-
src/prefs_template.c | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
- Log -----------------------------------------------------------------
commit 1f5a512b8539864f17ebdff70e4a2bb3dd7c1ca1
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Feb 12 21:33:48 2018 +0100
Get rid of all GtkHPaned and GtkVPaned in favour of GtkPaned.
Also bump required GTK3 version to 3.2, since that's where
this deprecation happened.
diff --git a/configure.ac b/configure.ac
index 87c95e5..569e4e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,7 +569,7 @@ dnl Checks for GTK
AM_CONDITIONAL(GTK3, false)
AM_CONDITIONAL(GTK2, true)
if test x"$enable_gtk3" = x"yes"; then
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.2 cairo)
AM_CONDITIONAL(GTK3, true)
AM_CONDITIONAL(GTK2, false)
else
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index af3ad08..2c8bb0c 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -348,7 +348,7 @@ static void present_finder_results(GtkWindow *parent)
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(dialog), vbox);
- hpaned = gtk_hpaned_new();
+ hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0);
scrolled_win = gtk_scrolled_window_new(NULL,NULL);
@@ -370,7 +370,7 @@ static void present_finder_results(GtkWindow *parent)
inline_edit_vbox = NULL;
} else {
inline_edit_vbox = gtk_vbox_new(FALSE, 4);
- vpaned = gtk_vpaned_new();
+ 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);
gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
diff --git a/src/addressbook.c b/src/addressbook.c
index 77c3b65..e9470b4 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1127,14 +1127,14 @@ static void addressbook_create(void)
if (!prefs_common.addressbook_use_editaddress_dialog) {
editaddress_vbox = gtk_vbox_new(FALSE, 4);
- vpaned = gtk_vpaned_new();
+ 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);
} else {
vpaned = NULL;
editaddress_vbox = NULL;
}
- hpaned = gtk_hpaned_new();
+ hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox2), hpaned, TRUE, TRUE, 0);
gtk_paned_pack1(GTK_PANED(hpaned), ctree_swin, FALSE, FALSE);
if (prefs_common.addressbook_use_editaddress_dialog)
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 74dbc4b..e312068 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3695,11 +3695,11 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
case VERTICAL_LAYOUT:
case NORMAL_LAYOUT:
case SMALL_LAYOUT:
- hpaned = gtk_hpaned_new();
+ hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
if (layout_mode == VERTICAL_LAYOUT)
- vpaned = gtk_hpaned_new();
+ vpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
else
- vpaned = gtk_vpaned_new();
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
gtk_paned_add1(GTK_PANED(hpaned),
GTK_WIDGET_PTR(mainwin->folderview));
@@ -3724,8 +3724,8 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
gtk_widget_queue_resize(vpaned);
break;
case WIDE_LAYOUT:
- vpaned = gtk_vpaned_new();
- hpaned = gtk_hpaned_new();
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+ hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox_body), vpaned, TRUE, TRUE, 0);
gtk_paned_add1(GTK_PANED(vpaned), hpaned);
@@ -3747,8 +3747,8 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
gtk_widget_queue_resize(vpaned);
break;
case WIDE_MSGLIST_LAYOUT:
- vpaned = gtk_vpaned_new();
- hpaned = gtk_hpaned_new();
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+ hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox_body), vpaned, TRUE, TRUE, 0);
gtk_paned_add1(GTK_PANED(vpaned),
diff --git a/src/mimeview.c b/src/mimeview.c
index dbb6259..a065624 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -428,7 +428,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET_PTR(siginfoview), FALSE, FALSE, 0);
- paned = gtk_vpaned_new();
+ paned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_widget_show(paned);
gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index effd911..fc6580c 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1750,7 +1750,7 @@ static MimeViewer *pdf_viewer_create(void)
viewer->widgets_table = gtk_table_new(1, 1, FALSE);
- viewer->doc_index_pane = gtk_hpaned_new();
+ viewer->doc_index_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
viewer->frame_index = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(viewer->frame_index), GTK_SHADOW_IN);
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 6779d0f..82f33c9 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -207,7 +207,7 @@ static void prefs_template_window_create(void)
gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
/* vpaned to separate template settings from templates list */
- vpaned = gtk_vpaned_new();
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_widget_show(vpaned);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
vpaned);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list