talons

commit 1faadd36188f6461d301bf5ec410ee8be54f4cab
parent 73c4549142fbe4b0ba492baa427e24b26618e0ad
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 28 Jul 2009 18:35:59 +0000

2009-07-28 [colin]	3.7.2cvs12

	* src/common/session.c
		Fix bug 1967, 'Claws gets stuck after accepting
		a certificate warning dialog'

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

4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-28 [colin]	3.7.2cvs12
+
+	* src/common/session.c
+		Fix bug 1967, 'Claws gets stuck after accepting 
+		a certificate warning dialog'
+
 2009-07-19 [paul]	3.7.2cvs11
 
 	* manual/plugins.xml
diff --git a/PATCHSETS b/PATCHSETS
@@ -3836,3 +3836,4 @@
 ( cvs diff -u -r 1.395.2.413 -r 1.395.2.414 src/summaryview.c;  ) > 3.7.2cvs9.patchset
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 manual/plugins.xml;  cvs diff -u -r 1.105.2.154 -r 1.105.2.155 src/prefs_account.c;  ) > 3.7.2cvs10.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 manual/plugins.xml;  ) > 3.7.2cvs11.patchset
+( cvs diff -u -r 1.23.2.23 -r 1.23.2.24 src/common/session.c;  ) > 3.7.2cvs12.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/session.c b/src/common/session.c
@@ -174,6 +174,11 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
 	}
 #endif
 
+	/* we could have gotten a timeout while waiting for user input in 
+	 * an SSL certificate dialog */
+	if (session->state == SESSION_TIMEOUT)
+		return -1;
+
 	sock_set_nonblocking_mode(sock, session->nonblocking);
 
 	debug_print("session (%p): connected\n", session);