2011-05-05 [colin] 3.7.9cvs19
authorColin Leroy <colin@colino.net>
Thu, 5 May 2011 07:26:37 +0000 (07:26 +0000)
committerColin Leroy <colin@colino.net>
Thu, 5 May 2011 07:26:37 +0000 (07:26 +0000)
* src/imap.c
* src/inc.c
* src/news.c
* src/send_message.c
Fix bug #2184, "Add account name information inside network log".
                Initial patch by MSulchan Darmawan, expanded to other protocols.
This stuff is too much copy-pasted.

ChangeLog
PATCHSETS
configure.ac
src/imap.c
src/inc.c
src/news.c
src/send_message.c

index 33b1639..74b5e8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-05 [colin]     3.7.9cvs19
+
+       * src/imap.c
+       * src/inc.c
+       * src/news.c
+       * src/send_message.c
+               Fix bug #2184, "Add account name information inside network log".
+                Initial patch by MSulchan Darmawan, expanded to other protocols.
+               This stuff is too much copy-pasted.
+
+
 2011-04-30 [colin]     3.7.9cvs18
 
        * src/main.c
index 2973cf3..7a7b7ec 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/es/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/it/claws-mail-manual.xml;  ) > 3.7.9cvs16.patchset
 ( cvs diff -u -r 1.65.2.72 -r 1.65.2.73 src/codeconv.c;  ) > 3.7.9cvs17.patchset
 ( cvs diff -u -r 1.115.2.237 -r 1.115.2.238 src/main.c;  ) > 3.7.9cvs18.patchset
+( cvs diff -u -r 1.179.2.254 -r 1.179.2.255 src/imap.c;  cvs diff -u -r 1.149.2.103 -r 1.149.2.104 src/inc.c;  cvs diff -u -r 1.101.2.64 -r 1.101.2.65 src/news.c;  cvs diff -u -r 1.17.2.59 -r 1.17.2.60 src/send_message.c;  ) > 3.7.9cvs19.patchset
index 9c74007..d76d275 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 77d551e..3fcd7d6 100644 (file)
@@ -1039,7 +1039,8 @@ static IMAPSession *imap_session_new(Folder * folder,
        gushort port;
        int r;
        int authenticated = FALSE;
-       
+       gchar *buf;
+
 #ifdef USE_GNUTLS
        /* FIXME: IMAP over SSL only... */ 
        SSLType ssl_type;
@@ -1066,7 +1067,12 @@ static IMAPSession *imap_session_new(Folder * folder,
 #endif
 
        imap_init(folder);
-       statuswindow_print_all(_("Connecting to IMAP4 server: %s..."), folder->account->recv_server);
+       buf = g_strdup_printf(_("Account '%s': Connecting to IMAP4 server: %s..."),
+                               folder->account->account_name, folder->account->recv_server);
+       statuswindow_print_all("%s", buf);
+       log_message(LOG_PROTOCOL, "%s\n", buf);
+       g_free(buf);
+
 #ifndef G_OS_WIN32
        if (account->set_tunnelcmd) {
                r = imap_threaded_connect_cmd(folder,
index 0f849c8..8d200b2 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -768,6 +768,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        Pop3Session *pop3_session = POP3_SESSION(session->session);
        IncProgressDialog *inc_dialog = (IncProgressDialog *)session->data;
        gchar *server;
+       gchar *account_name;
        gushort port;
        gchar *buf;
 
@@ -782,6 +783,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        g_free(buf);
 
        server = pop3_session->ac_prefs->recv_server;
+       account_name = pop3_session->ac_prefs->account_name;
 #ifdef USE_GNUTLS
        port = pop3_session->ac_prefs->set_popport ?
                pop3_session->ac_prefs->popport :
@@ -808,7 +810,8 @@ static IncState inc_pop3_session_do(IncSession *session)
                pop3_session->ac_prefs->popport : 110;
 #endif
 
-       buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
+       buf = g_strdup_printf(_("Account '%s': Connecting to POP3 server: %s..."),
+                               account_name, server);
        statuswindow_print_all("%s", buf);
        log_message(LOG_PROTOCOL, "%s\n", buf);
 
index 74d5e3e..e8380cd 100644 (file)
@@ -292,7 +292,8 @@ static Session *news_session_new(Folder *folder, const gchar *server, gushort po
        int r = 0;
        cm_return_val_if_fail(server != NULL, NULL);
 
-       log_message(LOG_PROTOCOL, _("creating NNTP connection to %s:%d ...\n"), server, port);
+       log_message(LOG_PROTOCOL, _("Account '%s': Connecting to NNTP server: %s...\n"),
+                                   folder->account->account_name, server);
 
        session = g_new0(NewsSession, 1);
        session_init(SESSION(session), folder->account, FALSE);
index 96f700a..3806e60 100644 (file)
@@ -322,8 +322,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                        inc_pop_before_smtp(ac_prefs);
                }
 
-               g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
-                          ac_prefs->smtp_server);
+               g_snprintf(buf, sizeof(buf), _("Account '%s': Connecting to SMTP server: %s ..."),
+                               ac_prefs->account_name, ac_prefs->smtp_server);
                progress_dialog_set_label(dialog->dialog, buf);
                log_message(LOG_PROTOCOL, "%s\n", buf);