talons

commit f2e1d4bbd0f06eed4b0728e65390e93687f0af6c
parent 15f0d14a0896c91f90bc10b9b5f0ad5a2e194828
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  2 Oct 2008 16:53:56 +0000

2008-10-02 [colin]	3.5.0cvs144

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

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

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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