From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 8 Apr 2002 16:38:08 +0000 (+0000)
Subject: sync with 0.7.4cvs33
X-Git-Tag: rel_0_7_5~47
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8e0e247b21d296a9bca999628ca748685420181c

sync with 0.7.4cvs33
---

diff --git a/ChangeLog b/ChangeLog
index 6503f242f..5ce59a302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-08
+
+	* src/imap.c: imap_open(): show warning message if IMAP4 session
+	  can't be established.
+
 2002-04-06
 
 	* src/compose.c: made template able to be inserted into the current
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9c7d375fe..300cd9edc 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-04-08 [paul]	0.7.4claws73
+
+	* sync with 0.7.4cvs33
+		see ChangeLog entry 200-04-08
+
 2002-04-07 [match]	0.7.4claws72
 
 	* src/addrharvest.[ch]
@@ -17,8 +22,8 @@
 
 	* src/esmtp.[ch]
 	  src/smtp.c
-		try to authenticate with CRAM-MD5 in SMTP when 
-		SMTP-AUTH enabled even if MTA doesn't issue this 
+		don't try to authenticate with CRAM-MD5 in SMTP when 
+		SMTP-AUTH enabled if MTA doesn't issue this 
 		auth-method in it's ehlo-response. bug item #531364,
 		patch item #938910. patch submitted by Colin Leroy 
 		<colin@colino.net>
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 7678a7127..6b152bfa1 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-04-08
+
+	* src/imap.c: imap_open(): IMAP4 ¥»¥Ã¥·¥ç¥ó¤¬³ÎΩ¤Ç¤­¤Ê¤¤¾ì¹ç·Ù¹ð
+	  ¥á¥Ã¥»¡¼¥¸¤ò½Ð¤¹¤è¤¦¤Ë¤·¤¿¡£
+
 2002-04-06
 
 	* src/compose.c: ¥Æ¥ó¥×¥ì¡¼¥È¤ò¸½ºß¤Î¥«¡¼¥½¥ë°ÌÃÖ¤ËÁÞÆþ¤Ç¤­¤ë¤è¤¦¤Ë
diff --git a/configure.in b/configure.in
index 13b522748..c26dd7b7e 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws72
+EXTRA_VERSION=claws73
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/imap.c b/src/imap.c
index 0f2e6fc0b..ee69bb0b3 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1573,6 +1573,8 @@ static SockInfo *imap_open_tunnel(const gchar *server,
 	SockInfo *sock;
 
 	if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL)
+		log_warning(_("Can't establish IMAP4 session with: %s\n"),
+			    server);
 		return NULL;
 
 	return imap_init_sock(sock);
@@ -1596,6 +1598,8 @@ static SockInfo *imap_open(const gchar *server, gushort port)
 
 #if USE_SSL
 	if (use_ssl && !ssl_init_socket(sock)) {
+		log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
+			    server, port);
 		sock_close(sock);
 		return NULL;
 	}
@@ -1610,6 +1614,7 @@ static SockInfo *imap_init_sock(SockInfo *sock)
 	imap_cmd_count = 0;
 
 	if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
+		log_warning(_("Can't establish IMAP4 session\n"));
 		sock_close(sock);
 		return NULL;
 	}
@@ -1617,8 +1622,6 @@ static SockInfo *imap_init_sock(SockInfo *sock)
 	return sock;
 }
 
-
-
 #define THROW goto catch
 
 static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)