2008-10-02 [colin] 3.5.0cvs144

	* src/common/session.c
		Fix crash when connection fails on windows

diff --git a/ChangeLog b/ChangeLog
index 2fe67944a1bc592c5c4f85830219cdd2f2f96ccf..f91aa2274495dc2d7b26c472533c45030bda8157 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-02 [colin]     3.5.0cvs144
+
+       * src/common/session.c
+               Fix crash when connection fails on windows
+
 2008-10-01 [colin]     3.5.0cvs143
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index d3e5851569922fe3e8c05b5ace722d1089441cc9..5cf537d0e9f670ce196731bb18c9e8ea94f218e4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3555,3 +3555,4 @@
 ( cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/ldapctrl.c;  cvs diff -u -r 1.115.2.209 -r 1.115.2.210 src/main.c;  cvs diff -u -r 1.3.2.59 -r 1.3.2.60 src/prefs_themes.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/printing.c;  ) > 3.5.0cvs141.patchset
 ( cvs diff -u -r 1.179.2.231 -r 1.179.2.232 src/imap.c;  ) > 3.5.0cvs142.patchset
 ( cvs diff -u -r 1.179.2.232 -r 1.179.2.233 src/imap.c;  ) > 3.5.0cvs143.patchset
+( cvs diff -u -r 1.23.2.19 -r 1.23.2.20 src/common/session.c;  ) > 3.5.0cvs144.patchset

diff --git a/configure.ac b/configure.ac
index c5ff91ba4e34a923608d304742906ee2f66c564c..e4c2b55bc798a151cb32608056b7e2fba3789b4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=143
+EXTRA_VERSION=144
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/session.c b/src/common/session.c
index 783135bb40c09c66444461a510af682ba3ba8447..cae294a84666f93f2d69146f3bb8e25794dc9af6 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -136,12 +136,12 @@ gint session_connect(Session *session, const gchar *server, gushort port)
        session->port = port;
 
        sock = sock_connect(server, port);
-       sock->is_smtp = session->is_smtp;
        if (sock == NULL) {
                g_warning("can't connect to server.");
                session_close(session);
                return -1;
        }
+       sock->is_smtp = session->is_smtp;
 
        return session_connect_cb(sock, session);
 #endif