we're synced...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d4e0dc4f956d54757c79eb0215eee6b97b640dd1..bbe4867f7f59a655fa2969707e93e1f2753f920e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,29 @@
+2004-08-10 [leroyc]    0.9.12cvs57
+
+       * src/main.c
+       * src/common/socket.c
+       * src/common/ssl.c
+       * src/common/sylpheed.c
+       * src/common/sylpheed.h
+               Put back the ssl connect nonblocking...
+               without the race condition
+
+2004-08-09 [colin]     0.9.12cvs56
+
+       * src/main.c
+       * src/common/ssl.c
+       * src/common/sylpheed.c
+       * src/common/sylpheed.h
+               Reverting previous commit, doesn't work 
+
+2004-08-09 [colin]     0.9.12cvs55
+
+       * src/main.c
+       * src/common/ssl.c
+       * src/common/sylpheed.c
+       * src/common/sylpheed.h
+               Make SSL_connect nonblocking, using a thread
+

 2004-08-09 [paul]       0.9.12cvs54
 
        * po/POTFILES.in
 2004-08-09 [paul]       0.9.12cvs54
 
        * po/POTFILES.in

diff --git a/configure.ac b/configure.ac
index c59cfec0d923f2647ee811a419a100af6af047d7..57b1a1edf2a258eef9ac394bd18e28a2b3eb063f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=55
+EXTRA_VERSION=57

 EXTRA_RELEASE=
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.4
+EXTRA_GTK2_VERSION=.1

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}