CVS: sylpheedclaws/sylpheed-claws/src imap.c,1.179.2.139,1.179.2.140

[email protected] Sat, 16 Dec 2006 16:38:15 +0000
Newsgroups gmane.mail.sylpheed.claws.cvs
Message-ID <[email protected]>
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv18098/src

Modified Files:
      Tag: gtk2
	imap.c 
Log Message:
2006-12-16 [colin]	2.6.1cvs43

	* po/POTFILES.in
	* src/imap.c
	* src/common/nntp.c
	* src/common/session.c
		Log error when SSL handshakes fail. 
		Fixes bug 1082, 'incorrect / imprecise 
		error message when imap server provides 
		ssl only through STARTTLS but SSL is 
		selected'

Index: imap.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/imap.c,v
retrieving revision 1.179.2.139
retrieving revision 1.179.2.140
diff -u -d -r1.179.2.139 -r1.179.2.140
--- imap.c	2006/11/27 08:06:16	1.179.2.139
+++ imap.c	2006/12/16 16:38:08	1.179.2.140
@@ -825,8 +825,14 @@
 		authenticated = FALSE;
 	}
 	else {
+#if (LIBETPAN_VERSION_MAJOR > 0 || LIBETPAN_VERSION_MINOR > 48)
+#ifdef USE_OPENSSL
+		if (r == MAILIMAP_ERROR_SSL)
+			log_error(_("SSL handshake failed\n"));
+#endif
+#endif
 		if(!prefs_common.no_recv_err_panel) {
-			alertpanel_error(_("Can't connect to IMAP4 server: %s:%d"),
+			alertpanel_error_log(_("Can't connect to IMAP4 server: %s:%d"),
 					 account->recv_server, port);
 		} else {
 			log_error(_("Can't connect to IMAP4 server: %s:%d\n"),