[Commits] [SCM] claws branch, master, updated. 3.14.0-124-gf9b68fc
claws at claws-mail.org
claws at claws-mail.org
Tue Oct 25 13:21:13 CEST 2016
The branch, master has been updated
via f9b68fc09c4ddf1cc6424c77375d7c4a40e73738 (commit)
from 59e8c1a1e7e11dddcc8c8e4fc8a5df71f955c792 (commit)
Summary of changes:
src/account.c | 12 ++++++------
src/etpan/imap-thread.c | 30 +++++++++++++++---------------
src/gtk/logwindow.c | 12 ++++++------
src/imap.c | 22 +++++++++++-----------
src/pop.c | 18 +++++++++---------
src/prefs_account.c | 22 +++++++++++-----------
6 files changed, 58 insertions(+), 58 deletions(-)
- Log -----------------------------------------------------------------
commit f9b68fc09c4ddf1cc6424c77375d7c4a40e73738
Author: Paul <paul at claws-mail.org>
Date: Tue Oct 25 12:21:07 2016 +0100
in the UI replace 'POP3' with 'POP' and 'IMAP4' with 'IMAP'
diff --git a/src/account.c b/src/account.c
index 07ce375..9c34f97 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1288,22 +1288,22 @@ static void account_list_view_add(PrefsAccount *ac_prefs)
#ifdef USE_GNUTLS
protocol = ac_prefs->protocol == A_POP3 ?
(ac_prefs->ssl_pop == SSL_TUNNEL ?
- "POP3 (SSL/TLS)" :
+ "POP (SSL/TLS)" :
ac_prefs->ssl_pop == SSL_STARTTLS ?
- "POP3 (STARTTLS)" : "POP3") :
+ "POP (STARTTLS)" : "POP") :
ac_prefs->protocol == A_IMAP4 ?
(ac_prefs->ssl_imap == SSL_TUNNEL ?
- "IMAP4 (SSL/TLS)" :
+ "IMAP (SSL/TLS)" :
ac_prefs->ssl_imap == SSL_STARTTLS ?
- "IMAP4 (STARTTLS)" : "IMAP4") :
+ "IMAP (STARTTLS)" : "IMAP") :
ac_prefs->protocol == A_NNTP ?
(ac_prefs->ssl_nntp == SSL_TUNNEL ?
"NNTP (SSL/TLS)" : "NNTP") :
ac_prefs->protocol == A_LOCAL ? "Local" :
ac_prefs->protocol == A_NONE ? "SMTP" : "-";
#else
- protocol = ac_prefs->protocol == A_POP3 ? "POP3" :
- ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
+ protocol = ac_prefs->protocol == A_POP3 ? "POP" :
+ ac_prefs->protocol == A_IMAP4 ? "IMAP" :
ac_prefs->protocol == A_LOCAL ? "Local" :
ac_prefs->protocol == A_NNTP ? "NNTP" :
ac_prefs->protocol == A_NONE ? "SMTP" : "-";
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 23a8d9f..f12f5de 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -86,7 +86,7 @@ static void imap_logger_cmd(int direction, const char * str, size_t size)
int i = 0;
if (size > 8192) {
- log_print(LOG_PROTOCOL, "IMAP4%c [CMD data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [CMD data - %zd bytes]\n", direction?'>':'<', size);
return;
}
buf = malloc(size+1);
@@ -107,7 +107,7 @@ static void imap_logger_cmd(int direction, const char * str, size_t size)
lines = g_strsplit(buf, "\n", -1);
while (lines[i] && *lines[i]) {
- log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP%c %s\n", direction?'>':'<', lines[i]);
i++;
}
g_strfreev(lines);
@@ -121,7 +121,7 @@ static void imap_logger_fetch(int direction, const char * str, size_t size)
int i = 0;
if (size > 128 && !direction) {
- log_print(LOG_PROTOCOL, "IMAP4%c [FETCH data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [FETCH data - %zd bytes]\n", direction?'>':'<', size);
return;
}
@@ -143,11 +143,11 @@ static void imap_logger_fetch(int direction, const char * str, size_t size)
if (direction != 0 || (buf[0] == '*' && buf[1] == ' ') || size < 32) {
while (lines[i] && *lines[i]) {
- log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP%c %s\n", direction?'>':'<', lines[i]);
i++;
}
} else {
- log_print(LOG_PROTOCOL, "IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [data - %zd bytes]\n", direction?'>':'<', size);
}
g_strfreev(lines);
free(buf);
@@ -160,7 +160,7 @@ static void imap_logger_uid(int direction, const char * str, size_t size)
int i = 0;
if (size > 8192) {
- log_print(LOG_PROTOCOL, "IMAP4%c [UID data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [UID data - %zd bytes]\n", direction?'>':'<', size);
return;
}
buf = malloc(size+1);
@@ -182,11 +182,11 @@ static void imap_logger_uid(int direction, const char * str, size_t size)
while (lines[i] && *lines[i]) {
int llen = strlen(lines[i]);
if (llen < 64)
- log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP%c %s\n", direction?'>':'<', lines[i]);
else {
gchar tmp[64];
strncpy2(tmp, lines[i], 63);
- log_print(LOG_PROTOCOL, "IMAP4%c %s[... - %d bytes more]\n", direction?'>':'<', tmp,
+ log_print(LOG_PROTOCOL, "IMAP%c %s[... - %d bytes more]\n", direction?'>':'<', tmp,
llen-64);
}
i++;
@@ -202,10 +202,10 @@ static void imap_logger_append(int direction, const char * str, size_t size)
int i = 0;
if (size > 8192) {
- log_print(LOG_PROTOCOL, "IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
return;
} else if (direction == 0 && size > 64) {
- log_print(LOG_PROTOCOL, "IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
return;
}
buf = malloc(size+1);
@@ -226,11 +226,11 @@ static void imap_logger_append(int direction, const char * str, size_t size)
if (direction == 0 || (buf[0] == '*' && buf[1] == ' ') || size < 64) {
while (lines[i] && *lines[i]) {
- log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP%c %s\n", direction?'>':'<', lines[i]);
i++;
}
} else {
- log_print(LOG_PROTOCOL, "IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP%c [data - %zd bytes]\n", direction?'>':'<', size);
}
g_strfreev(lines);
free(buf);
@@ -388,7 +388,7 @@ static void generic_cb(int cancelled, void * result, void * callback_data)
debug_print("generic_cb\n");
if (op->imap && op->imap->imap_response_info &&
op->imap->imap_response_info->rsp_alert) {
- log_error(LOG_PROTOCOL, "IMAP4< Alert: %s\n",
+ log_error(LOG_PROTOCOL, "IMAP< Alert: %s\n",
op->imap->imap_response_info->rsp_alert);
g_timeout_add(10, cb_show_error, NULL);
}
@@ -1996,7 +1996,7 @@ static void fetch_uid_run(struct etpan_thread_op * op)
fetch_result = NULL;
mailstream_logger = imap_logger_noop;
- log_print(LOG_PROTOCOL, "IMAP4- [fetching UIDs...]\n");
+ log_print(LOG_PROTOCOL, "IMAP- [fetching UIDs...]\n");
r = imap_get_messages_list(param->imap, param->first_index,
&fetch_result);
@@ -2253,7 +2253,7 @@ int imap_threaded_fetch_uid_flags(Folder * folder, uint32_t first_index,
param.first_index = first_index;
mailstream_logger = imap_logger_noop;
- log_print(LOG_PROTOCOL, "IMAP4- [fetching flags...]\n");
+ log_print(LOG_PROTOCOL, "IMAP- [fetching flags...]\n");
threaded_run(folder, ¶m, &result, fetch_uid_flags_run);
diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index 4cc3208..8faaf81 100644
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -330,14 +330,14 @@ static gboolean log_window_append(gpointer source, gpointer data)
if (logtext->instance == LOG_PROTOCOL) {
if (tag == NULL) {
- if (strstr(logtext->text, "] POP3>")
- || strstr(logtext->text, "] IMAP4>")
+ if (strstr(logtext->text, "] POP>")
+ || strstr(logtext->text, "] IMAP>")
|| strstr(logtext->text, "] SMTP>")
|| strstr(logtext->text, "] ESMTP>")
|| strstr(logtext->text, "] NNTP>"))
tag = "output";
- if (strstr(logtext->text, "] POP3<")
- || strstr(logtext->text, "] IMAP4<")
+ if (strstr(logtext->text, "] POP<")
+ || strstr(logtext->text, "] IMAP<")
|| strstr(logtext->text, "] SMTP<")
|| strstr(logtext->text, "] ESMTP<")
|| strstr(logtext->text, "] NNTP<"))
diff --git a/src/imap.c b/src/imap.c
index def398d..6c9161a 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -460,7 +460,7 @@ FolderClass *imap_get_class(void)
if (imap_class.idstr == NULL) {
imap_class.type = F_IMAP;
imap_class.idstr = "imap";
- imap_class.uistr = "IMAP4";
+ imap_class.uistr = "IMAP";
imap_class.supports_server_search = TRUE;
/* Folder functions */
@@ -576,7 +576,7 @@ static void imap_disc_session_destroy(IMAPSession *session)
if (rfolder == NULL)
return;
- log_warning(LOG_PROTOCOL, _("IMAP4 connection broken\n"));
+ log_warning(LOG_PROTOCOL, _("IMAP connection broken\n"));
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
}
@@ -1006,10 +1006,10 @@ static IMAPSession *imap_reconnect_if_possible(Folder *folder, IMAPSession *sess
session = NULL;
} else {
rfolder->session = NULL;
- log_warning(LOG_PROTOCOL, _("IMAP4 connection to %s has been"
+ log_warning(LOG_PROTOCOL, _("IMAP connection to %s has been"
" disconnected. Reconnecting...\n"),
folder->account->recv_server);
- statusbar_print_all(_("IMAP4 connection to %s has been"
+ statusbar_print_all(_("IMAP connection to %s has been"
" disconnected. Reconnecting...\n"),
folder->account->recv_server);
SESSION(session)->state = SESSION_DISCONNECTED;
@@ -1165,7 +1165,7 @@ static IMAPSession *imap_session_new(Folder * folder,
#endif
imap_init(folder);
- buf = g_strdup_printf(_("Account '%s': Connecting to IMAP4 server: %s:%d..."),
+ buf = g_strdup_printf(_("Account '%s': Connecting to IMAP server: %s:%d..."),
folder->account->account_name, folder->account->recv_server,
port);
statuswindow_print_all("%s", buf);
@@ -1213,10 +1213,10 @@ static IMAPSession *imap_session_new(Folder * folder,
imap_handle_error(NULL, account->recv_server, r);
if(!prefs_common.no_recv_err_panel) {
- alertpanel_error_log(_("Can't connect to IMAP4 server: %s:%d"),
+ alertpanel_error_log(_("Can't connect to IMAP server: %s:%d"),
account->recv_server, port);
} else {
- log_error(LOG_PROTOCOL, _("Can't connect to IMAP4 server: %s:%d\n"),
+ log_error(LOG_PROTOCOL, _("Can't connect to IMAP server: %s:%d\n"),
account->recv_server, port);
}
@@ -4129,18 +4129,18 @@ static gint imap_cmd_login(IMAPSession *session,
}
}
- log_print(LOG_PROTOCOL, "IMAP4> Logging %s to %s using %s\n",
+ log_print(LOG_PROTOCOL, "IMAP> Logging %s to %s using %s\n",
user,
SESSION(session)->server,
type);
r = imap_threaded_login(session->folder, user, pass, type);
if (r != MAILIMAP_NO_ERROR) {
imap_handle_error(SESSION(session), NULL, r);
- log_print(LOG_PROTOCOL, "IMAP4< Error logging in to %s\n",
+ log_print(LOG_PROTOCOL, "IMAP< Error logging in to %s\n",
SESSION(session)->server);
ok = r;
} else {
- log_print(LOG_PROTOCOL, "IMAP4< Login to %s successful\n",
+ log_print(LOG_PROTOCOL, "IMAP< Login to %s successful\n",
SESSION(session)->server);
ok = MAILIMAP_NO_ERROR;
}
@@ -6121,7 +6121,7 @@ FolderClass *imap_get_class(void)
if (imap_class.idstr == NULL) {
imap_class.type = F_IMAP;
imap_class.idstr = "imap";
- imap_class.uistr = "IMAP4";
+ imap_class.uistr = "IMAP";
imap_class.new_folder = imap_folder_new;
imap_class.create_tree = imap_create_tree;
diff --git a/src/pop.c b/src/pop.c
index 27f3afd..e8831a0 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -187,7 +187,7 @@ static gint pop3_getrange_stat_send(Pop3Session *session)
static gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg)
{
if (sscanf(msg, "%d %d", &session->count, &session->total_bytes) != 2) {
- log_error(LOG_PROTOCOL, _("POP3 protocol error\n"));
+ log_error(LOG_PROTOCOL, _("POP protocol error\n"));
session->error_val = PS_PROTOCOL;
return -1;
} else {
@@ -214,7 +214,7 @@ static gint pop3_getrange_last_recv(Pop3Session *session, const gchar *msg)
gint last;
if (sscanf(msg, "%d", &last) == 0) {
- log_warning(LOG_PROTOCOL, _("POP3 protocol error\n"));
+ log_warning(LOG_PROTOCOL, _("POP protocol error\n"));
session->error_val = PS_PROTOCOL;
return -1;
} else {
@@ -506,9 +506,9 @@ static void pop3_gen_send(Pop3Session *session, const gchar *format, ...)
va_end(args);
if (!g_ascii_strncasecmp(buf, "PASS ", 5))
- log_print(LOG_PROTOCOL, "POP3> PASS ********\n");
+ log_print(LOG_PROTOCOL, "POP> PASS ********\n");
else
- log_print(LOG_PROTOCOL, "POP3> %s\n", buf);
+ log_print(LOG_PROTOCOL, "POP> %s\n", buf);
session_send_msg(SESSION(session), buf);
}
@@ -838,7 +838,7 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
((ac->msg_leave_time * 24 * 60 * 60) +
(ac->msg_leave_hour * 60 * 60))) {
log_message(LOG_PROTOCOL,
- _("POP3: Deleting expired message %d [%s]\n"),
+ _("POP: Deleting expired message %d [%s]\n"),
session->cur_msg, msg->uidl?msg->uidl:" ");
session->cur_total_bytes += size;
pop3_delete_send(session);
@@ -854,7 +854,7 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
break;
log_message(LOG_PROTOCOL,
- _("POP3: Skipping message %d [%s] (%d bytes)\n"),
+ _("POP: Skipping message %d [%s] (%d bytes)\n"),
session->cur_msg, msg->uidl?msg->uidl:" ", size);
}
@@ -877,7 +877,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
{
Pop3ErrorValue ok;
- log_print(LOG_PROTOCOL, "POP3< %s\n", msg);
+ log_print(LOG_PROTOCOL, "POP< %s\n", msg);
if (!strncmp(msg, "+OK", 3))
ok = PS_SUCCESS;
@@ -913,14 +913,14 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
break;
default:
- log_error(LOG_PROTOCOL, _("error occurred on POP3 session\n"));
+ log_error(LOG_PROTOCOL, _("error occurred on POP session\n"));
ok = PS_ERROR;
}
}
g_free(session->error_msg);
session->error_msg = g_strdup(msg);
- g_printerr("POP3: %s\n", msg);
+ g_printerr("POP: %s\n", msg);
} else
ok = PS_PROTOCOL;
diff --git a/src/prefs_account.c b/src/prefs_account.c
index b729560..c54afcf 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -331,8 +331,8 @@ struct BasicProtocol {
};
static char *protocol_names[] = {
- N_("POP3"),
- N_("IMAP4"),
+ N_("POP"),
+ N_("IMAP"),
N_("News (NNTP)"),
N_("Local mbox file"),
N_("None (SMTP only)")
@@ -1451,7 +1451,7 @@ static void receive_create_widget_func(PrefsPage * _page,
G_CALLBACK (prefs_account_select_folder_cb),
local_inbox_entry);
- vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("POP3"));
+ vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("POP"));
PACK_CHECK_BUTTON (vbox2, use_apop_checkbtn,
_("Use secure authentication (APOP)"));
@@ -1564,7 +1564,7 @@ static void receive_create_widget_func(PrefsPage * _page,
gtk_spin_button_set_numeric
(GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);
- vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
+ vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
@@ -1848,7 +1848,7 @@ static void send_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY (smtp_auth_checkbtn, vbox4);
PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_checkbtn,
- _("Authenticate with POP3 before sending"));
+ _("Authenticate with POP before sending"));
g_signal_connect (G_OBJECT (pop_bfr_smtp_checkbtn), "clicked",
G_CALLBACK (pop_bfr_smtp_tm_set_sens),
@@ -2449,7 +2449,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- vbox2 = gtkut_get_options_frame(vbox1, &pop_frame, _("POP3"));
+ vbox2 = gtkut_get_options_frame(vbox1, &pop_frame, _("POP"));
CREATE_RADIO_BUTTONS(vbox2,
pop_nossl_radiobtn,
@@ -2464,7 +2464,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled",
G_CALLBACK(pop_ssltunnel_toggled), NULL);
- vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
+ vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
CREATE_RADIO_BUTTONS(vbox3,
imap_nossl_radiobtn,
@@ -2730,14 +2730,14 @@ static void advanced_create_widget_func(PrefsPage * _page,
PACK_HBOX (hbox_popport);
PACK_CHECK_BUTTON (hbox_popport, checkbtn_popport,
- _("POP3 port"));
+ _("POP port"));
PACK_PORT_SPINBTN (hbox_popport, spinbtn_popport);
SET_TOGGLE_SENSITIVITY (checkbtn_popport, spinbtn_popport);
gtk_size_group_add_widget(size_group, checkbtn_popport);
PACK_HBOX (hbox_imapport);
PACK_CHECK_BUTTON (hbox_imapport, checkbtn_imapport,
- _("IMAP4 port"));
+ _("IMAP port"));
PACK_PORT_SPINBTN (hbox_imapport, spinbtn_imapport);
SET_TOGGLE_SENSITIVITY (checkbtn_imapport, spinbtn_imapport);
gtk_size_group_add_widget(size_group, checkbtn_imapport);
@@ -2918,7 +2918,7 @@ static gint prefs_basic_apply(void)
}
if (protocol == A_POP3 &&
*gtk_entry_get_text(GTK_ENTRY(basic_page.recvserv_entry)) == '\0') {
- alertpanel_error(_("POP3 server is not entered."));
+ alertpanel_error(_("POP server is not entered."));
return -1;
}
if (protocol == A_POP3 || protocol == A_LOCAL) {
@@ -2944,7 +2944,7 @@ static gint prefs_basic_apply(void)
}
if (protocol == A_IMAP4 &&
*gtk_entry_get_text(GTK_ENTRY(basic_page.recvserv_entry)) == '\0') {
- alertpanel_error(_("IMAP4 server is not entered."));
+ alertpanel_error(_("IMAP server is not entered."));
return -1;
}
if (protocol == A_NNTP &&
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list