[Commits] imap.c 1.179.2.261 1.179.2.262 inc.c 1.149.2.110 1.149.2.111 news.c 1.101.2.71 1.101.2.72 send_message.c 1.17.2.64 1.17.2.65

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv21289/src

Modified Files:
      Tag: gtk2
	imap.c inc.c news.c send_message.c 
Log Message:
2012-09-19 [colin]	3.8.1cvs61

	* src/imap.c
	* src/inc.c
	* src/news.c
	* src/send_message.c
	* src/common/socket.c
		More precise error logging

Index: inc.c
===================================================================
RCS file: /home/claws-mail/claws/src/inc.c,v
retrieving revision 1.149.2.110
retrieving revision 1.149.2.111
diff -u -d -r1.149.2.110 -r1.149.2.111
--- inc.c	12 Sep 2012 09:23:12 -0000	1.149.2.110
+++ inc.c	19 Sep 2012 09:45:32 -0000	1.149.2.111
@@ -829,8 +829,8 @@
 		pop3_session->ac_prefs->popport : 110;
 #endif
 
-	buf = g_strdup_printf(_("Account '%s': Connecting to POP3 server: %s..."),
-				account_name, server);
+	buf = g_strdup_printf(_("Account '%s': Connecting to POP3 server: %s:%d..."),
+				account_name, server, port);
 	statuswindow_print_all("%s", buf);
 	log_message(LOG_PROTOCOL, "%s\n", buf);
 
@@ -1152,7 +1152,6 @@
 
 	switch (istate) {
 	case INC_CONNECT_ERROR:
-		log_msg = _("Connection failed.");
 		fatal_error = TRUE;
 		if (prefs_common.no_recv_err_panel)
 			break;

Index: send_message.c
===================================================================
RCS file: /home/claws-mail/claws/src/send_message.c,v
retrieving revision 1.17.2.64
retrieving revision 1.17.2.65
diff -u -d -r1.17.2.64 -r1.17.2.65
--- send_message.c	7 Jul 2012 07:09:30 -0000	1.17.2.64
+++ send_message.c	19 Sep 2012 09:45:32 -0000	1.17.2.65
@@ -326,8 +326,8 @@
 			inc_pop_before_smtp(ac_prefs);
 		}
 
-		g_snprintf(buf, sizeof(buf), _("Account '%s': Connecting to SMTP server: %s ..."),
-				ac_prefs->account_name, ac_prefs->smtp_server);
+		g_snprintf(buf, sizeof(buf), _("Account '%s': Connecting to SMTP server: %s:%d..."),
+				ac_prefs->account_name, ac_prefs->smtp_server, port);
 		progress_dialog_set_label(dialog->dialog, buf);
 		log_message(LOG_PROTOCOL, "%s\n", buf);
 

Index: imap.c
===================================================================
RCS file: /home/claws-mail/claws/src/imap.c,v
retrieving revision 1.179.2.261
retrieving revision 1.179.2.262
diff -u -d -r1.179.2.261 -r1.179.2.262
--- imap.c	13 Sep 2012 07:47:27 -0000	1.179.2.261
+++ imap.c	19 Sep 2012 09:45:32 -0000	1.179.2.262
@@ -1068,8 +1068,9 @@
 #endif
 
 	imap_init(folder);
-	buf = g_strdup_printf(_("Account '%s': Connecting to IMAP4 server: %s..."),
-				folder->account->account_name, folder->account->recv_server);
+	buf = g_strdup_printf(_("Account '%s': Connecting to IMAP4 server: %s:%d..."),
+				folder->account->account_name, folder->account->recv_server,
+				port);
 	statuswindow_print_all("%s", buf);
 	log_message(LOG_PROTOCOL, "%s\n", buf);
 	g_free(buf);
@@ -1193,10 +1194,7 @@
 	} else if (account->imap_auth_type == IMAP_AUTH_ANON || account->imap_auth_type == IMAP_AUTH_GSSAPI) {
 		pass = "";
 	}
-	statuswindow_print_all(_("Connecting to IMAP4 server %s...\n"),
-				account->recv_server);
 	if ((ok = imap_auth(session, account->userid, pass, account->imap_auth_type)) != MAILIMAP_NO_ERROR) {
-		statusbar_pop_all();
 		
 		if (!failed && !is_fatal(ok)) {
 			acc_pass = NULL;

Index: news.c
===================================================================
RCS file: /home/claws-mail/claws/src/news.c,v
retrieving revision 1.101.2.71
retrieving revision 1.101.2.72
diff -u -d -r1.101.2.71 -r1.101.2.72
--- news.c	16 Sep 2012 21:56:20 -0000	1.101.2.71
+++ news.c	19 Sep 2012 09:45:32 -0000	1.101.2.72
@@ -293,8 +293,8 @@
 	int r = 0;
 	cm_return_val_if_fail(server != NULL, NULL);
 
-	log_message(LOG_PROTOCOL, _("Account '%s': Connecting to NNTP server: %s...\n"),
-				    folder->account->account_name, server);
+	log_message(LOG_PROTOCOL, _("Account '%s': Connecting to NNTP server: %s:%d...\n"),
+				    folder->account->account_name, server, port);
 
 	session = g_new0(NewsSession, 1);
 	session_init(SESSION(session), folder->account, FALSE);