2009-07-28 [colin] 3.7.2cvs12

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

diff --git a/ChangeLog b/ChangeLog
index a2435cba8fa80bacc2966c66c2110fbc6bf1381a..6feed44eb40640679fe4084e9059942cafb1b447 100644 (file)
--- 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
index fd6d5030cdcf9afa4c2420723772bced532950c4..94a0563c817186bacc859919697048584dc7fbb3 100644 (file)
--- 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
index 900c03531092ed19748c23941ee54b5606afa269..2de662c5422b511100d621b55415030b7a0600b3 100644 (file)
--- 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
index 380c2ee488b625d19b7a237a937ead128148c4a7..21213f7e9ac965929ddc7585428e3845d7031f30 100644 (file)
--- 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);