talons

commit 65aa49624267d5b9b50f33b0159ec45447df7628
parent 5345993700332abbe8cccfed82aefdd8fd202fd7
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 25 May 2011 10:45:42 +0000

2011-05-25 [colin]	3.7.9cvs24

	* src/action.c
		Fix bug #2439, "use bitwise operator for bitmask instead of
		logical operator". Thanks to Nicolas Kaiser for the patch.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/action.c
 | 
2
+-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-25 [colin]	3.7.9cvs24
+
+	* src/action.c
+		Fix bug #2439, "use bitwise operator for bitmask instead of
+		logical operator". Thanks to Nicolas Kaiser for the patch.
+
 2011-05-18 [colin]	3.7.9cvs23
 
 	* src/news.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4175,3 +4175,4 @@
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/etpan/nntp-thread.c;  ) > 3.7.9cvs21.patchset
 ( cvs diff -u -r 1.36.2.192 -r 1.36.2.193 src/common/utils.c;  ) > 3.7.9cvs22.patchset
 ( cvs diff -u -r 1.101.2.65 -r 1.101.2.66 src/news.c;  ) > 3.7.9cvs23.patchset
+( cvs diff -u -r 1.12.2.65 -r 1.12.2.66 src/action.c;  ) > 3.7.9cvs24.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/action.c b/src/action.c
@@ -1526,7 +1526,7 @@ static void catch_input(gpointer data, gint source, GdkInputCondition cond)
 	gssize by_read = 0, by_written = 0;
 
 	debug_print("Sending input to grand child.\n");
-	if (!(cond && GDK_INPUT_WRITE))
+	if (!(cond & GDK_INPUT_WRITE))
 		return;
 
 	gtk_widget_set_sensitive(children->input_hbox, FALSE);