From: Colin Leroy <colin@colino.net>
Date: Tue, 21 Sep 2004 06:36:30 +0000 (+0000)
Subject: 2004-09-21 [colin]	0.9.12cvs102.3
X-Git-Tag: gtk2_win32_last_merge~162
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b2b25f7c770cfdf45d9370610c53ef0bc6209c00

2004-09-21 [colin]	0.9.12cvs102.3

	* src/action.c
		Add horizontal scrollbar in action io dialog as needed
		Patch by Alfons.
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index a29d17e7e..b9a2ceec9 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-09-21 [colin]	0.9.12cvs102.3
+
+	* src/action.c
+		Add horizontal scrollbar in action io dialog as needed
+		Patch by Alfons.
+
 2004-09-20 [colin]	0.9.12cvs102.2
 
 	* src/plugins/image_viewer/viewer.c
diff --git a/PATCHSETS b/PATCHSETS
index 1c8559a84..58bf909ae 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -172,3 +172,4 @@
 ( cvs diff -u -r 1.2504.2.20 -r 1.2504.2.21 ChangeLog.claws; cvs diff -u -r 1.115.2.17 -r 1.115.2.18 src/main.c; ) > 0.9.12cvs101.1.patchset
 ( cvs diff -u -r 1.396.2.9 -r 1.396.2.10 ChangeLog; cvs diff -u -r 1.2504.2.21 -r 1.2504.2.22 ChangeLog.claws; cvs diff -u -r 1.391.2.9 -r 1.391.2.10 ChangeLog.jp; cvs diff -u -r 1.654.2.204 -r 1.654.2.205 configure.ac; cvs diff -u -r 1.149.2.14 -r 1.149.2.15 src/inc.c; ) > 0.9.12cvs102.1.patchset
 ( cvs diff -u -r 1.7.2.7 -r 1.7.2.8 src/plugins/image_viewer/viewer.c; ) > 0.9.12cvs102.2.patchset
+( cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/action.c; ) > 0.9.12cvs102.3.patchset
diff --git a/configure.ac b/configure.ac
index abce0bf5e..0f2963352 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=102
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/action.c b/src/action.c
index e5b8a6179..5001dee7a 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1150,7 +1150,8 @@ static void create_io_dialog(Children *children)
 
 	scrolledwin = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-				       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+				       GTK_POLICY_AUTOMATIC, 
+				       GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
 	gtk_widget_set_size_request(scrolledwin, 480, 200);
 	gtk_widget_hide(scrolledwin);