From: Colin Leroy <colin@colino.net>
Date: Mon, 31 Jul 2006 17:12:55 +0000 (+0000)
Subject: 2006-07-31 [colin]	2.4.0cvs6
X-Git-Tag: rel_2_5_0~219
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=56ca0ae068e794319dfa8e6ac63d37eb423419a8

2006-07-31 [colin]	2.4.0cvs6

	* src/action.c
		Fix problem with "> stuff >" actions
---

diff --git a/ChangeLog b/ChangeLog
index c7bb13dd8..e538456cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31 [colin]	2.4.0cvs6
+
+	* src/action.c
+		Fix problem with "> stuff >" actions
+
 2006-07-31 [paul]	2.4.0cvs5
 
 	* po/nb.po
diff --git a/PATCHSETS b/PATCHSETS
index d7a29b107..05f5e4fc6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1697,3 +1697,4 @@
 ( cvs diff -u -r 1.155.2.39 -r 1.155.2.40 src/Makefile.am;  cvs diff -u -r 1.27.2.18 -r 1.27.2.19 src/addr_compl.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/addr_compl.h;  cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/addressbook.c;  cvs diff -u -r 1.18.2.2 -r 1.18.2.3 src/addressbook.h;  diff -u /dev/null src/addressbook_foldersel.c;  diff -u /dev/null src/addressbook_foldersel.h;  cvs diff -u -r 1.28.2.17 -r 1.28.2.18 src/addrindex.c;  cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/addrindex.h;  cvs diff -u -r 1.75.2.27 -r 1.75.2.28 src/matcher.c;  cvs diff -u -r 1.39.2.7 -r 1.39.2.8 src/matcher.h;  cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/matcher_parser_lex.l;  cvs diff -u -r 1.25.2.15 -r 1.25.2.16 src/matcher_parser_parse.y;  cvs diff -u -r 1.204.2.92 -r 1.204.2.93 src/prefs_common.c;  cvs diff -u -r 1.103.2.54 -r 1.103.2.55 src/prefs_common.h;  cvs diff -u -r 1.59.2.37 -r 1.59.2.38 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.40 -r 1.43.2.41 src/prefs_matcher.c;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/prefs_matcher.h;  cvs diff -u -r 1.395.2.224 -r 1.395.2.225 src/summaryview.c;  ) > 2.4.0cvs3.patchset
 ( cvs diff -u -r 1.274.2.128 -r 1.274.2.129 src/mainwindow.c;  cvs diff -u -r 1.395.2.225 -r 1.395.2.226 src/summaryview.c;  cvs diff -u -r 1.68.2.24 -r 1.68.2.25 src/summaryview.h;  ) > 2.4.0cvs4.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/nb.po;  ) > 2.4.0cvs5.patchset
+( cvs diff -u -r 1.12.2.36 -r 1.12.2.37 src/action.c;  ) > 2.4.0cvs6.patchset
diff --git a/configure.ac b/configure.ac
index c1fc393fd..f0731be90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/action.c b/src/action.c
index 9f9dd05c3..636da4b2d 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1467,7 +1467,7 @@ static void catch_output(gpointer data, gint source, GdkInputCondition cond)
 			if (ret_str && bytes_written > 0) {
 				gtk_text_buffer_insert
 					(textbuf, &iter, ret_str,
-					 bytes_written);
+					 -1);
 				g_free(ret_str);
 			} else
 				gtk_text_buffer_insert(textbuf, &iter, buf, c);