};
static char *protocol_names[] = {
- N_("POP3"),
- N_("IMAP4"),
+ N_("POP"),
+ N_("IMAP"),
N_("News (NNTP)"),
N_("Local mbox file"),
N_("None (SMTP only)")
/* Passwords are handled outside of PrefParams. */
buf = passwd_store_get_account(ac_prefs->account_id,
PWS_ACCOUNT_RECV);
- gtk_entry_set_text(GTK_ENTRY(page->pass_entry), buf);
- g_free(buf);
+ gtk_entry_set_text(GTK_ENTRY(page->pass_entry), buf != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
}
page->vbox = vbox1;
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)"));
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);
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),
/* Passwords are handled outside of PrefParams. */
buf = passwd_store_get_account(ac_prefs->account_id,
PWS_ACCOUNT_SEND);
- gtk_entry_set_text(GTK_ENTRY(page->smtp_pass_entry), buf);
- g_free(buf);
+ gtk_entry_set_text(GTK_ENTRY(page->smtp_pass_entry), buf != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
}
pop_bfr_smtp_tm_set_sens (NULL, NULL);
gtk_table_set_col_spacings (GTK_TABLE (table), 8);
autocc_checkbtn = gtk_check_button_new_with_label (
- prefs_common_translated_header_name("Cc"));
+ prefs_common_translated_header_name("Cc:"));
gtk_widget_show (autocc_checkbtn);
gtk_table_attach (GTK_TABLE (table), autocc_checkbtn, 0, 1, 0, 1,
GTK_FILL, 0, 0, 0);
SET_TOGGLE_SENSITIVITY (autocc_checkbtn, autocc_entry);
autobcc_checkbtn = gtk_check_button_new_with_label (
- prefs_common_translated_header_name("Bcc"));
+ prefs_common_translated_header_name("Bcc:"));
gtk_widget_show (autobcc_checkbtn);
gtk_table_attach (GTK_TABLE (table), autobcc_checkbtn, 0, 1, 1, 2,
GTK_FILL, 0, 0, 0);
SET_TOGGLE_SENSITIVITY (autobcc_checkbtn, autobcc_entry);
autoreplyto_checkbtn = gtk_check_button_new_with_label (
- prefs_common_translated_header_name("Reply-To"));
+ prefs_common_translated_header_name("Reply-To:"));
gtk_widget_show (autoreplyto_checkbtn);
gtk_table_attach (GTK_TABLE (table), autoreplyto_checkbtn, 0, 1, 2, 3,
GTK_FILL, 0, 0, 0);
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,
- _("Don't use SSL"),
+ _("Don't use SSL/TLS"),
SSL_NONE,
pop_ssltunnel_radiobtn,
- _("Use SSL for POP3 connection"),
+ _("Use SSL/TLS"),
SSL_TUNNEL,
pop_starttls_radiobtn,
- _("Use STARTTLS command to start SSL session"),
+ _("Use STARTTLS command to start encrypted session"),
SSL_STARTTLS);
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,
- _("Don't use SSL"),
+ _("Don't use SSL/TLS"),
SSL_NONE,
imap_ssltunnel_radiobtn,
- _("Use SSL for IMAP4 connection"),
+ _("Use SSL/TLS"),
SSL_TUNNEL,
imap_starttls_radiobtn,
- _("Use STARTTLS command to start SSL session"),
+ _("Use STARTTLS command to start encrypted session"),
SSL_STARTTLS);
g_signal_connect(G_OBJECT(imap_ssltunnel_radiobtn), "toggled",
G_CALLBACK(imap_ssltunnel_toggled), NULL);
vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP"));
nntp_nossl_radiobtn =
- gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
+ gtk_radio_button_new_with_label (NULL, _("Don't use SSL/TLS"));
gtk_widget_show (nntp_nossl_radiobtn);
gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
FALSE, FALSE, 0);
GINT_TO_POINTER (SSL_NONE));
CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
- _("Use SSL for NNTP connection"), SSL_TUNNEL);
+ _("Use SSL/TLS"), SSL_TUNNEL);
g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled",
G_CALLBACK(nntp_ssltunnel_toggled), NULL);
CREATE_RADIO_BUTTONS(vbox5,
smtp_nossl_radiobtn,
- _("Don't use SSL (but, if necessary, use STARTTLS)"),
+ _("Don't use SSL/TLS (but, if necessary, use STARTTLS)"),
SSL_NONE,
smtp_ssltunnel_radiobtn,
- _("Use SSL for SMTP connection"),
+ _("Use SSL/TLS"),
SSL_TUNNEL,
smtp_starttls_radiobtn,
- _("Use STARTTLS command to start SSL session"),
+ _("Use STARTTLS command to start encrypted session"),
SSL_STARTTLS);
g_signal_connect(G_OBJECT(smtp_ssltunnel_radiobtn), "toggled",
G_CALLBACK(smtp_ssltunnel_toggled), NULL);
gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0);
PACK_CHECK_BUTTON(vbox7, ssl_certs_auto_accept_checkbtn,
- _("Automatically accept valid SSL certificates"));
+ _("Automatically accept valid SSL/TLS certificates"));
PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn,
- _("Use non-blocking SSL"));
+ _("Use non-blocking SSL/TLS"));
hbox = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox);
gtk_widget_set_size_request (hbox_spc, 16, -1);
label = gtk_label_new
- (_("Turn this off if you have SSL connection problems"));
+ (_("Turn this off if you have SSL/TLS connection problems"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtkut_widget_set_small_font_size (label);
/* Passwords are handled outside of PrefParams. */
buf = passwd_store_get_account(ac_prefs->account_id,
PWS_ACCOUNT_RECV_CERT);
- gtk_entry_set_text(GTK_ENTRY(page->entry_in_cert_pass), buf);
- g_free(buf);
+ gtk_entry_set_text(GTK_ENTRY(page->entry_in_cert_pass), buf != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
+
buf = passwd_store_get_account(ac_prefs->account_id,
PWS_ACCOUNT_SEND_CERT);
- gtk_entry_set_text(GTK_ENTRY(page->entry_out_cert_pass), buf);
- g_free(buf);
+ gtk_entry_set_text(GTK_ENTRY(page->entry_out_cert_pass), buf != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
}
page->vbox = vbox1;
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);
}
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) {
}
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 &&
static gchar *path[3];
path[0] = _("Account");
- path[1] = _("SSL");
+ path[1] = _("SSL/TLS");
path[2] = NULL;
ssl_page.page.path = path;
}
#endif
+gchar *prefs_account_generate_msgid(PrefsAccount *account)
+{
+ gchar *addr, *tmbuf, *buf = NULL;
+ GDateTime *now;
+ gchar *user_addr = account->msgid_with_addr ? g_strdup(account->address) : NULL;
+
+ if (account->set_domain && account->domain) {
+ buf = g_strdup(account->domain);
+ } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
+ buf = g_strdup(
+ strchr(account->address, '@') ?
+ strchr(account->address, '@')+1 :
+ account->address);
+ }
+
+ if (user_addr != NULL) {
+ addr = g_strdup_printf(".%s", user_addr);
+ } else {
+ addr = g_strdup_printf("@%s",
+ buf != NULL && strlen(buf) > 0 ?
+ buf : get_domain_name());
+ }
+
+ if (buf != NULL)
+ g_free(buf);
+ if (user_addr != NULL)
+ g_free(user_addr);
+
+ /* Replace all @ but the last one in addr, with underscores.
+ * RFC 2822 States that msg-id syntax only allows one @.
+ */
+ while (strchr(addr, '@') != NULL && strchr(addr, '@') != strrchr(addr, '@'))
+ *(strchr(addr, '@')) = '_';
+
+ now = g_date_time_new_now_local();
+ tmbuf = g_date_time_format(now, "%Y%m%d%H%M%S");
+ buf = g_strdup_printf("%s.%08x%s",
+ tmbuf, (guint)rand(), addr);
+ g_free(tmbuf);
+ g_free(addr);
+
+ debug_print("Generated Message-ID string '%s'\n", buf);
+ return buf;
+}
+
void prefs_account_register_page(PrefsPage *page)
{
prefs_pages = g_slist_append(prefs_pages, page);
{
prefs_pages = g_slist_remove(prefs_pages, page);
}
+
+gchar *prefs_account_cache_dir(PrefsAccount *ac_prefs, gboolean for_server)
+{
+ gchar *dir = NULL;
+#ifdef G_OS_WIN32
+ gchar *sanitized_server;
+#endif
+
+ if (ac_prefs->protocol == A_IMAP4) {
+#ifdef G_OS_WIN32
+ sanitized_server = g_strdup(ac_prefs->recv_server);
+ g_strdelimit(sanitized_server, ":", ',');
+#endif
+ if (for_server) {
+ dir = g_strconcat(get_imap_cache_dir(),
+ G_DIR_SEPARATOR_S,
+#ifdef G_OS_WIN32
+ sanitized_server,
+#else
+ ac_prefs->recv_server,
+#endif
+ NULL);
+ } else {
+ dir = g_strconcat(get_imap_cache_dir(),
+ G_DIR_SEPARATOR_S,
+#ifdef G_OS_WIN32
+ sanitized_server,
+#else
+ ac_prefs->recv_server,
+#endif
+ G_DIR_SEPARATOR_S,
+ ac_prefs->userid,
+ NULL);
+ }
+#ifdef G_OS_WIN32
+ g_free(sanitized_server);
+#endif
+ }
+
+ return dir;
+}