/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-
+#if !GTK_CHECK_VERSION(3, 0, 0)
+#include "gtkcmoptionmenu.h"
+#endif
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_account.h"
#include "account.h"
#include "mainwindow.h"
#include "manage_window.h"
+#include "folder.h"
#include "foldersel.h"
#include "inc.h"
#include "menu.h"
#include "smtp.h"
#include "imap.h"
#include "remotefolder.h"
-#include "base64.h"
#include "combobox.h"
#include "setup.h"
#include "quote_fmt.h"
+#include "hooks.h"
+#include "privacy.h"
+#include "inputdialog.h"
+#include "ssl_certificate.h"
+#include "passwordstore.h"
static gboolean cancelled;
static gboolean new_account;
-static gboolean create_mailbox;
static PrefsAccount tmp_ac_prefs;
static GtkWidget *signature_browse_button;
static GtkWidget *signature_edit_button;
+#ifdef USE_GNUTLS
+static GtkWidget *entry_in_cert_file;
+static GtkWidget *entry_out_cert_file;
+static GtkWidget *in_ssl_cert_browse_button;
+static GtkWidget *out_ssl_cert_browse_button;
+#endif
+
static GSList *prefs_pages = NULL;
typedef struct BasicPage
GtkWidget *pass_label;
GtkWidget *uid_entry;
GtkWidget *pass_entry;
+ GtkWidget *auto_configure_btn;
+ GtkWidget *auto_configure_cancel_btn;
+ GtkWidget *auto_configure_lbl;
} BasicPage;
typedef struct ReceivePage
GtkWidget *use_apop_checkbtn;
GtkWidget *rmmail_checkbtn;
GtkWidget *leave_time_spinbtn;
+ GtkWidget *leave_hour_spinbtn;
GtkWidget *size_limit_checkbtn;
GtkWidget *size_limit_spinbtn;
GtkWidget *inbox_label;
GtkWidget *frame_maxarticle;
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
- GtkObject *maxarticle_spinbtn_adj;
+ GtkAdjustment *maxarticle_spinbtn_adj;
} ReceivePage;
typedef struct SendPage
GtkWidget *vbox;
GtkWidget *msgid_checkbtn;
+ GtkWidget *xmailer_checkbtn;
GtkWidget *customhdr_checkbtn;
+ GtkWidget *msgid_with_addr_checkbtn;
GtkWidget *smtp_auth_checkbtn;
GtkWidget *smtp_auth_type_optmenu;
GtkWidget *smtp_uid_entry;
GtkWidget *autobcc_entry;
GtkWidget *autoreplyto_checkbtn;
GtkWidget *autoreplyto_entry;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkWidget *checkbtn_enable_default_dictionary;
GtkWidget *combo_default_dictionary;
GtkWidget *checkbtn_enable_default_alt_dictionary;
GtkWidget *default_encrypt_checkbtn;
GtkWidget *default_encrypt_reply_checkbtn;
GtkWidget *default_sign_checkbtn;
+ GtkWidget *default_sign_reply_checkbtn;
GtkWidget *save_clear_text_checkbtn;
GtkWidget *encrypt_to_self_checkbtn;
} PrivacyPage;
GtkWidget *smtp_ssltunnel_radiobtn;
GtkWidget *smtp_starttls_radiobtn;
+ GtkWidget *entry_in_cert_file;
+ GtkWidget *entry_in_cert_pass;
+ GtkWidget *entry_out_cert_file;
+ GtkWidget *entry_out_cert_pass;
+
+ GtkWidget *ssl_certs_auto_accept_checkbtn;
GtkWidget *use_nonblocking_ssl_checkbtn;
} SSLPage;
GtkWidget *nntpport_spinbtn;
GtkWidget *domain_checkbtn;
GtkWidget *domain_entry;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *crosspost_checkbtn;
GtkWidget *crosspost_colormenu;
+#endif
#ifndef G_OS_WIN32
GtkWidget *tunnelcmd_checkbtn;
static ComposePage compose_page;
static TemplatesPage templates_page;
static PrivacyPage privacy_page;
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static SSLPage ssl_page;
#endif
static AdvancedPage advanced_page;
};
static char *protocol_names[] = {
- N_("POP3"),
- NULL, /* APOP, deprecated */
- NULL, /* RPOP, deprecated */
- N_("IMAP4"),
+ N_("POP"),
+ N_("IMAP"),
N_("News (NNTP)"),
N_("Local mbox file"),
N_("None (SMTP only)")
static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam);
static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void crosspost_color_toggled(void);
static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
+#endif
static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
gpointer user_data);
static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button,
gpointer user_data);
-#if USE_ASPELL
+#if USE_ENCHANT
static void prefs_account_compose_default_dictionary_set_string_from_optmenu
(PrefParam *pparam);
static void prefs_account_compose_default_dictionary_set_optmenu_from_string
&basic_page.uid_entry, prefs_set_data_from_entry, prefs_set_entry},
{"password", NULL, &tmp_ac_prefs.passwd, P_PASSWORD,
- &basic_page.pass_entry, prefs_set_data_from_entry, prefs_set_entry},
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
&receive_page.rmmail_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
{"message_leave_time", "7", &tmp_ac_prefs.msg_leave_time, P_INT,
&receive_page.leave_time_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
&receive_page.leave_time_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
#endif
+ {"message_leave_hour", "0", &tmp_ac_prefs.msg_leave_hour, P_INT,
+ &receive_page.leave_hour_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
&receive_page.size_limit_checkbtn,
&send_page.msgid_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"generate_xmailer", "TRUE", &tmp_ac_prefs.gen_xmailer, P_BOOL,
+ &send_page.xmailer_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
&send_page.customhdr_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
+ {"msgid_with_addr", "FALSE", &tmp_ac_prefs.msgid_with_addr, P_BOOL,
+ &send_page.msgid_with_addr_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
&send_page.smtp_auth_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
&send_page.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
{"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_PASSWORD,
- &send_page.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
+ NULL, NULL, NULL},
{"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
&send_page.pop_bfr_smtp_checkbtn,
&compose_page.autoreplyto_entry,
prefs_set_data_from_entry, prefs_set_entry},
-#if USE_ASPELL
+#if USE_ENCHANT
{"enable_default_dictionary", "", &tmp_ac_prefs.enable_default_dictionary, P_BOOL,
&compose_page.checkbtn_enable_default_dictionary,
prefs_set_data_from_toggle, prefs_set_toggle},
{"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
&privacy_page.default_sign_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
-
+#ifdef G_OS_UNIX
+ {"default_sign_reply", "TRUE", &tmp_ac_prefs.default_sign_reply, P_BOOL,
+ &privacy_page.default_sign_reply_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+#else
+ /* Bug 2367: disturbing for Win32 users with no keypair */
+ {"default_sign_reply", "FALSE", &tmp_ac_prefs.default_sign_reply, P_BOOL,
+ &privacy_page.default_sign_reply_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+#endif
{"save_clear_text", "FALSE", &tmp_ac_prefs.save_encrypted_as_clear_text, P_BOOL,
&privacy_page.save_clear_text_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
};
static PrefParam ssl_param[] = {
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
{"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
&ssl_page.pop_nossl_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
+ {"ssl_certs_auto_accept", "0", &tmp_ac_prefs.ssl_certs_auto_accept, P_BOOL,
+ &ssl_page.ssl_certs_auto_accept_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
&ssl_page.use_nonblocking_ssl_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"in_ssl_client_cert_file", "", &tmp_ac_prefs.in_ssl_client_cert_file, P_STRING,
+ &ssl_page.entry_in_cert_file, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"in_ssl_client_cert_pass", "", &tmp_ac_prefs.in_ssl_client_cert_pass, P_PASSWORD,
+ NULL, NULL, NULL},
+
+ {"out_ssl_client_cert_file", "", &tmp_ac_prefs.out_ssl_client_cert_file, P_STRING,
+ &ssl_page.entry_out_cert_file, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"out_ssl_client_cert_pass", "", &tmp_ac_prefs.out_ssl_client_cert_pass, P_PASSWORD,
+ NULL, NULL, NULL},
#else
{"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
NULL, NULL, NULL},
{"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
NULL, NULL, NULL},
+ {"in_ssl_client_cert_file", "", &tmp_ac_prefs.in_ssl_client_cert_file, P_STRING,
+ NULL, NULL, NULL},
+
+ {"in_ssl_client_cert_pass", "", &tmp_ac_prefs.in_ssl_client_cert_pass, P_PASSWORD,
+ NULL, NULL, NULL},
+
+ {"out_ssl_client_cert_file", "", &tmp_ac_prefs.out_ssl_client_cert_file, P_STRING,
+ NULL, NULL, NULL},
+
+ {"out_ssl_client_cert_pass", "", &tmp_ac_prefs.out_ssl_client_cert_pass, P_PASSWORD,
+ NULL, NULL, NULL},
+
+ {"ssl_certs_auto_accept", "0", &tmp_ac_prefs.ssl_certs_auto_accept, P_BOOL,
+ NULL, NULL, NULL},
+
{"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
NULL, NULL, NULL},
-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
{"domain", NULL, &tmp_ac_prefs.domain, P_STRING,
&advanced_page.domain_entry,
prefs_set_data_from_entry, prefs_set_entry},
+
+#ifdef USE_GNUTLS
+ {"gnutls_set_priority", "FALSE", &tmp_ac_prefs.set_gnutls_priority, P_BOOL,
+ NULL, NULL, NULL},
+
+ {"gnutls_priority", NULL, &tmp_ac_prefs.gnutls_priority, P_STRING,
+ NULL, NULL, NULL},
+#endif
+
#ifndef G_OS_WIN32
{"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
&advanced_page.tunnelcmd_checkbtn,
&advanced_page.tunnelcmd_entry,
prefs_set_data_from_entry, prefs_set_entry},
#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
{"mark_crosspost_read", "FALSE", &tmp_ac_prefs.mark_crosspost_read, P_BOOL,
&advanced_page.crosspost_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
&advanced_page.crosspost_colormenu,
prefs_account_crosspost_set_data_from_colormenu,
prefs_account_crosspost_set_colormenu},
+#endif
{"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
&advanced_page.sent_folder_checkbtn,
{"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
&advanced_page.trash_folder_entry,
prefs_set_data_from_entry, prefs_set_entry},
+
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
static void prefs_account_signature_browse_cb (GtkWidget *widget,
gpointer data);
+#ifdef USE_GNUTLS
+static void prefs_account_in_cert_browse_cb (GtkWidget *widget,
+ gpointer data);
+static void prefs_account_out_cert_browse_cb (GtkWidget *widget,
+ gpointer data);
+#endif
static void prefs_account_signature_edit_cb (GtkWidget *widget,
gpointer data);
static void pop_bfr_smtp_tm_set_sens (GtkWidget *widget,
gpointer data);
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_cb (GtkWidget *widget,
+ gpointer data);
+
+#endif
static void prefs_account_edit_custom_header (void);
* system choice. */
static void privacy_system_activated(GtkWidget *combobox)
{
- const gchar *system_id;
- gboolean privacy_enabled = FALSE;
- gint privacy_enabled_int;
- GtkTreeIter iter;
- GtkListStore *menu = GTK_LIST_STORE(gtk_combo_box_get_model(
- GTK_COMBO_BOX(combobox)));
-
- gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter);
-
- gtk_tree_model_get(GTK_TREE_MODEL(menu), &iter,
- COMBOBOX_PRIVACY_PLUGIN_ID, &system_id,
- COMBOBOX_DATA, &privacy_enabled_int,
- -1);
-
- privacy_enabled = strcmp(system_id, "");
-
- if( privacy_enabled_int == 0 )
- privacy_enabled = FALSE;
-
- gtk_widget_set_sensitive (privacy_page.default_encrypt_checkbtn,
- privacy_enabled);
- gtk_widget_set_sensitive (privacy_page.default_encrypt_reply_checkbtn,
- privacy_enabled);
- gtk_widget_set_sensitive (privacy_page.default_sign_checkbtn,
- privacy_enabled);
- gtk_widget_set_sensitive (privacy_page.encrypt_to_self_checkbtn,
- privacy_enabled);
gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn,
- privacy_enabled && !gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
+ !gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
}
/* Populate the privacy system choice combobox with valid choices */
GtkWidget *pass_label;
GtkWidget *uid_entry;
GtkWidget *pass_entry;
+ GtkWidget *auto_configure_btn;
+ GtkWidget *auto_configure_cancel_btn;
+ GtkWidget *auto_configure_lbl;
GtkListStore *menu;
GtkTreeIter iter;
+ gchar *buf;
struct BasicProtocol *protocol_optmenu;
gint i;
default_checkbtn = gtk_check_button_new_with_label (_("Set as default"));
gtk_widget_show (default_checkbtn);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
gtk_box_pack_end (GTK_BOX (hbox), default_checkbtn, TRUE, FALSE, 0);
#else
gtk_box_pack_start (GTK_BOX (vbox1), default_checkbtn, FALSE, FALSE, 0);
gtk_label_set_justify(GTK_LABEL(optlabel), GTK_JUSTIFY_CENTER);
gtk_box_pack_start(GTK_BOX (optmenubox), optlabel, FALSE, FALSE, 0);
+ auto_configure_btn = gtk_button_new_with_label(_("Auto-configure"));
+ gtk_box_pack_start(GTK_BOX (optmenubox), auto_configure_btn, FALSE, FALSE, 0);
+ auto_configure_cancel_btn = gtk_button_new_with_label(_("Cancel"));
+ gtk_box_pack_start(GTK_BOX (optmenubox), auto_configure_cancel_btn, FALSE, FALSE, 0);
+ auto_configure_lbl = gtk_label_new("");
+ gtk_label_set_justify(GTK_LABEL(auto_configure_lbl), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX (optmenubox), auto_configure_lbl, FALSE, FALSE, 0);
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ gtk_widget_show(auto_configure_btn);
+ gtk_widget_show(auto_configure_lbl);
+ g_signal_connect (G_OBJECT (auto_configure_btn), "clicked",
+ G_CALLBACK (auto_configure_cb), NULL);
+ g_signal_connect (G_OBJECT (auto_configure_cancel_btn), "clicked",
+ G_CALLBACK (auto_configure_cb), NULL);
+#endif
+
no_imap_warn_icon = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
- no_imap_warn_label = gtk_label_new(_("<span weight=\"bold\">Warning: this version of Claws Mail\n"
- "has been built without IMAP and News support.</span>"));
+ no_imap_warn_label = gtk_label_new(g_strconcat("<span weight=\"bold\">",
+ _("Warning: this version of Claws Mail\n"
+ "has been built without IMAP and News support."), "</span>", NULL));
gtk_label_set_use_markup(GTK_LABEL(no_imap_warn_label), TRUE);
gtk_box_pack_start(GTK_BOX (optmenubox), no_imap_warn_icon, FALSE, FALSE, 0);
pass_entry = gtk_entry_new ();
gtk_widget_show (pass_entry);
gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
#endif
gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
-#ifdef MAEMO
- hildon_gtk_entry_set_input_mode(GTK_ENTRY(pass_entry),
- HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
nntpserv_label = gtk_label_new (_("News server"));
gtk_widget_show (nntpserv_label);
pass_label = gtk_label_new (_("Password"));
gtk_widget_show (pass_label);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8,
0, 0, 0, 0);
#else
page->pass_label = pass_label;
page->uid_entry = uid_entry;
page->pass_entry = pass_entry;
+ page->auto_configure_btn = auto_configure_btn;
+ page->auto_configure_cancel_btn = auto_configure_cancel_btn;
+ page->auto_configure_lbl = auto_configure_lbl;
- create_mailbox = FALSE;
if (new_account) {
PrefsAccount *def_ac;
- gchar *buf;
prefs_set_dialog_to_default(basic_param);
buf = g_strdup_printf(_("Account%d"), ac_prefs->account_id);
gtk_entry_set_text(GTK_ENTRY(receive_page.local_inbox_entry),
id);
g_free(id);
- } else {
- create_mailbox = TRUE;
}
}
- } else
+ } else {
prefs_set_dialog(basic_param);
+ /* 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 != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
+ }
+
page->vbox = vbox1;
page->page.widget = vbox1;
GtkWidget *use_apop_checkbtn;
GtkWidget *rmmail_checkbtn;
GtkWidget *hbox_spc;
- GtkTooltips *leave_time_tooltip;
GtkWidget *leave_time_label;
GtkWidget *leave_time_spinbtn;
+ GtkWidget *leave_hour_label;
+ GtkWidget *leave_hour_spinbtn;
GtkWidget *hbox1;
GtkWidget *size_limit_checkbtn;
GtkWidget *size_limit_spinbtn;
- GtkTooltips *size_limit_tooltip;
GtkWidget *label;
GtkWidget *filter_on_recv_checkbtn;
GtkWidget *filterhook_on_recv_checkbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
- GtkTooltips *inbox_tooltip;
GtkWidget *imap_frame;
GtkWidget *imapdir_label;
GtkWidget *imapdir_entry;
GtkWidget *frame2;
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
- GtkObject *maxarticle_spinbtn_adj;
- GtkTooltips *maxarticle_tool_tip;
-
- inbox_tooltip = gtk_tooltips_new();
- size_limit_tooltip = gtk_tooltips_new();
+ GtkAdjustment *maxarticle_spinbtn_adj;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
local_inbox_entry = gtk_entry_new ();
gtk_widget_show (local_inbox_entry);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_entry,
- _("Unfiltered messages will be stored in this folder"),
- NULL);
+ CLAWS_SET_TIP(local_inbox_entry,
+ _("Unfiltered messages will be stored in this folder"));
gtk_widget_set_size_request (local_inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_entry, TRUE, TRUE, 0);
local_inbox_btn = gtkut_get_browse_file_btn(_("Bro_wse"));
gtk_widget_show (local_inbox_btn);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_btn,
- _("Unfiltered messages will be stored in this folder"),
- NULL);
+ CLAWS_SET_TIP(local_inbox_btn,
+ _("Unfiltered messages will be stored in this folder"));
gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (local_inbox_btn), "clicked",
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_widget_show (leave_time_label);
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
- leave_time_tooltip = gtk_tooltips_new();
-
leave_time_spinbtn = gtk_spin_button_new_with_range(0, 365, 1);
gtk_widget_show (leave_time_spinbtn);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(leave_time_tooltip), leave_time_spinbtn,
- _("0 days: remove immediately"), NULL);
+ CLAWS_SET_TIP(leave_time_spinbtn,
+ _("0 days and 0 hours : remove immediately"));
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_spinbtn, FALSE, FALSE, 0);
leave_time_label = gtk_label_new (_("days"));
gtk_widget_show (leave_time_label);
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+ leave_hour_spinbtn = gtk_spin_button_new_with_range(0, 23, 1);
+ gtk_widget_show (leave_hour_spinbtn);
+ CLAWS_SET_TIP(leave_hour_spinbtn,
+ _("0 days and 0 hours : remove immediately"));
+ gtk_box_pack_start (GTK_BOX (hbox1), leave_hour_spinbtn, FALSE, FALSE, 0);
+
+ leave_hour_label = gtk_label_new (_("hours"));
+ gtk_widget_show (leave_hour_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), leave_hour_label, FALSE, FALSE, 0);
+
SET_TOGGLE_SENSITIVITY (rmmail_checkbtn, hbox1);
hbox1 = gtk_hbox_new (FALSE, 8);
PACK_CHECK_BUTTON (hbox1, size_limit_checkbtn, _("Receive size limit"));
- gtk_tooltips_set_tip(GTK_TOOLTIPS(size_limit_tooltip), size_limit_checkbtn,
+ CLAWS_SET_TIP(size_limit_checkbtn,
_("Messages over this limit will be partially retrieved. "
"When selecting them you will be able to download them fully "
- "or delete them."),
- NULL);
+ "or delete them."));
size_limit_spinbtn = gtk_spin_button_new_with_range(0, 100000, 1);
gtk_widget_show (size_limit_spinbtn);
inbox_entry = gtk_entry_new ();
gtk_widget_show (inbox_entry);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_entry,
- _("Unfiltered messages will be stored in this folder"),
- NULL);
+ CLAWS_SET_TIP(inbox_entry,
+ _("Unfiltered messages will be stored in this folder"));
gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
inbox_btn = gtkut_get_browse_file_btn(_("Bro_wse"));
gtk_widget_show (inbox_btn);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_btn,
- _("Unfiltered messages will be stored in this folder"),
- NULL);
+ CLAWS_SET_TIP(inbox_btn,
+ _("Unfiltered messages will be stored in this folder"));
gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (inbox_btn), "clicked",
G_CALLBACK (prefs_account_select_folder_cb),
gtk_widget_show (maxarticle_label);
gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
- maxarticle_tool_tip = gtk_tooltips_new();
-
maxarticle_spinbtn_adj =
- gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
+ GTK_ADJUSTMENT(gtk_adjustment_new (300, 0, 10000, 10, 100, 0));
maxarticle_spinbtn = gtk_spin_button_new
(GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
gtk_widget_show (maxarticle_spinbtn);
- gtk_tooltips_set_tip(maxarticle_tool_tip, maxarticle_spinbtn,
- _("unlimited if 0 is specified"), NULL);
+ CLAWS_SET_TIP(maxarticle_spinbtn,
+ _("unlimited if 0 is specified"));
gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_spinbtn,
FALSE, FALSE, 0);
gtk_widget_set_size_request (maxarticle_spinbtn, 64, -1);
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);
gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
COMBOBOX_ADD (menu, _("Automatic"), 0);
- COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
+ COMBOBOX_ADD (menu, NULL, 0);
+ COMBOBOX_ADD (menu, _("Plain text"), IMAP_AUTH_PLAINTEXT);
COMBOBOX_ADD (menu, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
COMBOBOX_ADD (menu, "GSSAPI", IMAP_AUTH_GSSAPI);
COMBOBOX_ADD (menu, "DIGEST-MD5", IMAP_AUTH_DIGEST_MD5);
+ COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
+ COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN);
+ COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
PACK_CHECK_BUTTON (hbox1, low_bandwidth_checkbtn,
_("Bandwidth-efficient mode (prevents retrieving remote tags)"));
- gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), low_bandwidth_checkbtn,
- _("This mode uses less bandwidth, but can be slower with some servers."),
- NULL);
+ CLAWS_SET_TIP(low_bandwidth_checkbtn,
+ _("This mode uses less bandwidth, but can be slower with some servers."));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
PACK_CHECK_BUTTON (vbox1, filter_on_recv_checkbtn,
_("Filter messages on receiving"));
page->use_apop_checkbtn = use_apop_checkbtn;
page->rmmail_checkbtn = rmmail_checkbtn;
page->leave_time_spinbtn = leave_time_spinbtn;
+ page->leave_hour_spinbtn = leave_hour_spinbtn;
page->size_limit_checkbtn = size_limit_checkbtn;
page->size_limit_spinbtn = size_limit_spinbtn;
page->filter_on_recv_checkbtn = filter_on_recv_checkbtn;
page->imap_auth_type_optmenu = optmenu;
page->imapdir_label = imapdir_label;
- page->imapdir_entry = imapdir_entry;
+ page->imapdir_entry = imapdir_entry;
page->subsonly_checkbtn = subsonly_checkbtn;
- page->low_bandwidth_checkbtn = low_bandwidth_checkbtn;
+ page->low_bandwidth_checkbtn = low_bandwidth_checkbtn;
page->local_frame = local_frame;
page->local_inbox_label = local_inbox_label;
page->local_inbox_entry = local_inbox_entry;
GtkWidget *vbox2;
GtkWidget *frame;
GtkWidget *msgid_checkbtn;
+ GtkWidget *xmailer_checkbtn;
GtkWidget *hbox;
GtkWidget *customhdr_checkbtn;
GtkWidget *customhdr_edit_btn;
+ GtkWidget *checkbtn_msgid_with_addr;
GtkWidget *vbox3;
GtkWidget *smtp_auth_checkbtn;
GtkWidget *optmenu;
GtkWidget *pop_bfr_smtp_tm_spinbtn;
GtkWidget *pop_auth_timeout_lbl;
GtkWidget *pop_auth_minutes_lbl;
+ gchar *buf;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
PACK_CHECK_BUTTON (vbox2, msgid_checkbtn, _("Generate Message-ID"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_msgid_with_addr,
+ _("Send account mail address in Message-ID"));
+
+ PACK_CHECK_BUTTON (vbox2, xmailer_checkbtn,
+ _("Add user agent header"));
+
hbox = gtk_hbox_new (FALSE, 12);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
COMBOBOX_ADD (menu, _("Automatic"), 0);
+ COMBOBOX_ADD (menu, NULL, 0);
COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN);
COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN);
COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
gtk_widget_set_size_request (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
-#ifdef MAEMO
- hildon_gtk_entry_set_input_mode(GTK_ENTRY(smtp_pass_entry),
- HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
hbox = gtk_hbox_new (FALSE, 8);
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),
gtk_box_pack_start (GTK_BOX (hbox), pop_auth_minutes_lbl, FALSE, FALSE, 0);
page->msgid_checkbtn = msgid_checkbtn;
+ page->xmailer_checkbtn = xmailer_checkbtn;
page->customhdr_checkbtn = customhdr_checkbtn;
+ page->msgid_with_addr_checkbtn = checkbtn_msgid_with_addr;
page->smtp_auth_checkbtn = smtp_auth_checkbtn;
page->smtp_auth_type_optmenu = optmenu;
if (new_account) {
prefs_set_dialog_to_default(send_param);
- } else
+ } else {
prefs_set_dialog(send_param);
+ /* 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 != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
+ }
+
pop_bfr_smtp_tm_set_sens (NULL, NULL);
page->vbox = vbox1;
GtkWidget *autobcc_entry;
GtkWidget *autoreplyto_checkbtn;
GtkWidget *autoreplyto_entry;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkWidget *frame_dict;
GtkWidget *table_dict;
GtkWidget *checkbtn_enable_default_dictionary = NULL;
vbox_sig = gtkut_get_options_frame(vbox1, &frame_sig, _("Signature"));
PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
- _("Insert signature automatically"));
+ _("Automatically insert signature"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
gtk_table_set_col_spacings (GTK_TABLE (table), 8);
- autocc_checkbtn = gtk_check_button_new_with_label (_("Cc"));
+ autocc_checkbtn = gtk_check_button_new_with_label (
+ 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 (_("Bcc"));
+ autobcc_checkbtn = gtk_check_button_new_with_label (
+ 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 (_("Reply-To"));
+ autoreplyto_checkbtn = gtk_check_button_new_with_label (
+ 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);
SET_TOGGLE_SENSITIVITY (autoreplyto_checkbtn, autoreplyto_entry);
-#if USE_ASPELL
+#if USE_ENCHANT
PACK_FRAME (vbox1, frame_dict, _("Spell check dictionaries"));
table_dict = gtk_table_new (2, 2, FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
tmp_ac_prefs.enable_default_dictionary);
- combo_default_dictionary = gtkaspell_dictionary_combo_new(
- prefs_common.aspell_path, TRUE);
+ combo_default_dictionary = gtkaspell_dictionary_combo_new(TRUE);
gtk_table_attach(GTK_TABLE(table_dict), combo_default_dictionary, 1, 2,
0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
tmp_ac_prefs.enable_default_alt_dictionary);
- combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(
- prefs_common.aspell_path, FALSE);
+ combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(FALSE);
gtk_table_attach(GTK_TABLE(table_dict), combo_default_alt_dictionary, 1, 2,
1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
page->autobcc_entry = autobcc_entry;
page->autoreplyto_checkbtn = autoreplyto_checkbtn;
page->autoreplyto_entry = autoreplyto_entry;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
page->combo_default_dictionary = combo_default_dictionary;
page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
page->combo_default_alt_dictionary = combo_default_alt_dictionary;
#endif
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
/* reset gtkaspell menus */
if (compose_page.combo_default_dictionary != NULL) {
gtk_combo_box_set_model(GTK_COMBO_BOX(compose_page.combo_default_dictionary),
- gtkaspell_dictionary_store_new(prefs_common.aspell_path));
+ gtkaspell_dictionary_store_new());
gtk_combo_box_set_model(GTK_COMBO_BOX(compose_page.combo_default_alt_dictionary),
gtkaspell_dictionary_store_new_with_refresh(
- prefs_common.aspell_path, FALSE));
+ FALSE));
}
#endif
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
/* compose format */
window,
vbox2,
&page->checkbtn_compose_with_format,
+ NULL,
&page->compose_subject_format,
&page->compose_body_format,
- FALSE);
+ TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
/* reply format */
window,
vbox2,
&page->checkbtn_reply_with_format,
+ NULL,
&page->reply_quotemark,
&page->reply_body_format,
- FALSE);
+ TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Reply")));
/* forward format */
window,
vbox2,
&page->checkbtn_forward_with_format,
+ NULL,
&page->forward_quotemark,
&page->forward_body_format,
- FALSE);
+ TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Forward")));
- quotefmt_add_info_button(window, vbox);
-
tmp_ac_prefs = *ac_prefs;
if (new_account) {
GtkWidget *default_encrypt_checkbtn;
GtkWidget *default_encrypt_reply_checkbtn;
GtkWidget *default_sign_checkbtn;
+ GtkWidget *default_sign_reply_checkbtn;
GtkWidget *save_clear_text_checkbtn;
GtkWidget *encrypt_to_self_checkbtn;
_("Always sign messages"));
PACK_CHECK_BUTTON (vbox2, default_encrypt_checkbtn,
_("Always encrypt messages"));
+ PACK_CHECK_BUTTON (vbox2, default_sign_reply_checkbtn,
+ _("Always sign messages when replying to a "
+ "signed message"));
PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_checkbtn,
_("Always encrypt messages when replying to an "
"encrypted message"));
page->default_privacy_system = default_privacy_system;
page->default_encrypt_checkbtn = default_encrypt_checkbtn;
page->default_encrypt_reply_checkbtn = default_encrypt_reply_checkbtn;
+ page->default_sign_reply_checkbtn = default_sign_reply_checkbtn;
page->default_sign_checkbtn = default_sign_checkbtn;
page->save_clear_text_checkbtn = save_clear_text_checkbtn;
page->encrypt_to_self_checkbtn = encrypt_to_self_checkbtn;
page->page.widget = vbox1;
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data) \
{ \
CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data); \
}
+static void pop_ssltunnel_toggled(GtkToggleButton *button,
+ gpointer data)
+{
+ gboolean active = gtk_toggle_button_get_active(button);
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+ advanced_page.popport_checkbtn)) == TRUE)
+ return;
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.popport_spinbtn),
+ active ? 995 : 110);
+}
+
+static void imap_ssltunnel_toggled(GtkToggleButton *button,
+ gpointer data)
+{
+ gboolean active = gtk_toggle_button_get_active(button);
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+ advanced_page.imapport_checkbtn)) == TRUE)
+ return;
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.imapport_spinbtn),
+ active ? 993 : 143);
+}
+
+static void nntp_ssltunnel_toggled(GtkToggleButton *button,
+ gpointer data)
+{
+ gboolean active = gtk_toggle_button_get_active(button);
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+ advanced_page.nntpport_checkbtn)) == TRUE)
+ return;
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.nntpport_spinbtn),
+ active ? 563 : 119);
+}
+
+static void smtp_ssltunnel_toggled(GtkToggleButton *button,
+ gpointer data)
+{
+ gboolean active = gtk_toggle_button_get_active(button);
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+ advanced_page.smtpport_checkbtn)) == TRUE)
+ return;
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn),
+ active ? 465 : 25);
+}
+
static void ssl_create_widget_func(PrefsPage * _page,
GtkWindow * window,
gpointer data)
GtkWidget *smtp_ssltunnel_radiobtn;
GtkWidget *smtp_starttls_radiobtn;
- GtkWidget *vbox6;
+ GtkWidget *cert_frame;
+ GtkWidget *cert_table;
+ GtkWidget *entry_in_cert_pass;
+ GtkWidget *entry_out_cert_pass;
+
+ GtkWidget *vbox7;
+ GtkWidget *ssl_certs_auto_accept_checkbtn;
GtkWidget *use_nonblocking_ssl_checkbtn;
GtkWidget *hbox;
GtkWidget *hbox_spc;
GtkWidget *label;
+ gchar *buf;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
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);
-
- vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
+ g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled",
+ G_CALLBACK(pop_ssltunnel_toggled), NULL);
+
+ 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);
vbox5 = gtkut_get_options_frame(vbox1, &send_frame, _("Send (SMTP)"));
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);
+
+ PACK_FRAME(vbox1, cert_frame, _("Client certificates"));
- vbox6 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox6);
- gtk_box_pack_start (GTK_BOX (vbox1), vbox6, FALSE, FALSE, 0);
+ cert_table = gtk_table_new(4,3, FALSE);
+ gtk_container_add(GTK_CONTAINER(cert_frame), cert_table);
+ gtk_container_set_border_width(GTK_CONTAINER(cert_table), 8);
+ gtk_table_set_row_spacings(GTK_TABLE(cert_table), VSPACING_NARROW_2);
+ gtk_table_set_col_spacings(GTK_TABLE(cert_table), 8);
+
+ label = gtk_label_new(_("Certificate for receiving"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ entry_in_cert_file = gtk_entry_new();
+ in_ssl_cert_browse_button = gtkut_get_browse_file_btn(_("Browse"));
+ CLAWS_SET_TIP(label,
+ _("Client certificate file as a PKCS12 or PEM file"));
+ CLAWS_SET_TIP(entry_in_cert_file,
+ _("Client certificate file as a PKCS12 or PEM file"));
+ gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(cert_table), entry_in_cert_file, 1, 2, 0, 1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(cert_table), in_ssl_cert_browse_button, 2, 3, 0, 1,
+ GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("Password"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ entry_in_cert_pass = gtk_entry_new();
+ gtk_entry_set_visibility(GTK_ENTRY(entry_in_cert_pass), FALSE);
+ gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(cert_table), entry_in_cert_pass, 1, 2, 1, 2,
+ GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("Certificate for sending"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ entry_out_cert_file = gtk_entry_new();
+ out_ssl_cert_browse_button = gtkut_get_browse_file_btn(_("Browse"));
+ CLAWS_SET_TIP(label,
+ _("Client certificate file as a PKCS12 or PEM file"));
+ CLAWS_SET_TIP(entry_out_cert_file,
+ _("Client certificate file as a PKCS12 or PEM file"));
+ gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(cert_table), entry_out_cert_file, 1, 2, 2, 3,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(cert_table), out_ssl_cert_browse_button, 2, 3, 2, 3,
+ GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("Password"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ entry_out_cert_pass = gtk_entry_new();
+ gtk_entry_set_visibility(GTK_ENTRY(entry_out_cert_pass), FALSE);
+ gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(cert_table), entry_out_cert_pass, 1, 2, 3, 4,
+ GTK_FILL, 0, 0, 0);
+ gtk_widget_show_all(cert_table);
+
+ g_signal_connect(G_OBJECT(in_ssl_cert_browse_button), "clicked",
+ G_CALLBACK(prefs_account_in_cert_browse_cb), NULL);
+ g_signal_connect(G_OBJECT(out_ssl_cert_browse_button), "clicked",
+ G_CALLBACK(prefs_account_out_cert_browse_cb), NULL);
+
+ vbox7 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox7);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0);
- PACK_CHECK_BUTTON(vbox6, use_nonblocking_ssl_checkbtn,
- _("Use non-blocking SSL"));
+ PACK_CHECK_BUTTON(vbox7, ssl_certs_auto_accept_checkbtn,
+ _("Automatically accept valid SSL/TLS certificates"));
+
+ PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn,
+ _("Use non-blocking SSL/TLS"));
hbox = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox6), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox7), hbox, FALSE, FALSE, 0);
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox_spc);
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);
page->smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
page->smtp_starttls_radiobtn = smtp_starttls_radiobtn;
+ page->entry_in_cert_file = entry_in_cert_file;
+ page->entry_in_cert_pass = entry_in_cert_pass;
+ page->entry_out_cert_file = entry_out_cert_file;
+ page->entry_out_cert_pass = entry_out_cert_pass;
+
+ page->ssl_certs_auto_accept_checkbtn = ssl_certs_auto_accept_checkbtn;
page->use_nonblocking_ssl_checkbtn = use_nonblocking_ssl_checkbtn;
tmp_ac_prefs = *ac_prefs;
if (new_account) {
prefs_set_dialog_to_default(ssl_param);
- } else
+ } else {
prefs_set_dialog(ssl_param);
+ /* 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 != 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 != NULL ? buf : "");
+ if (buf != NULL) {
+ memset(buf, 0, strlen(buf));
+ g_free(buf);
+ }
+ }
+
page->vbox = vbox1;
page->page.widget = vbox1;
#undef CREATE_RADIO_BUTTONS
#undef CREATE_RADIO_BUTTON
-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */
static void advanced_create_widget_func(PrefsPage * _page,
GtkWindow * window,
GtkWidget *spinbtn_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
+ gchar *tip_domain;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *checkbtn_crosspost;
GtkWidget *colormenu_crosspost;
GtkWidget *menu;
+#endif
#ifndef G_OS_WIN32
GtkWidget *checkbtn_tunnelcmd;
GtkWidget *entry_tunnelcmd;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_checkbtn;
GtkWidget *trash_folder_entry;
- GtkTooltips *tips = gtk_tooltips_new();
+ GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
#define PACK_HBOX(hbox) \
{ \
hbox = gtk_hbox_new (FALSE, 8); \
PACK_CHECK_BUTTON (hbox1, checkbtn_smtpport, _("SMTP port"));
PACK_PORT_SPINBTN (hbox1, spinbtn_smtpport);
SET_TOGGLE_SENSITIVITY (checkbtn_smtpport, spinbtn_smtpport);
-
+ gtk_size_group_add_widget(size_group, checkbtn_smtpport);
+
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);
PACK_HBOX (hbox_nntpport);
PACK_CHECK_BUTTON (hbox_nntpport, checkbtn_nntpport,
_("NNTP port"));
PACK_PORT_SPINBTN (hbox_nntpport, spinbtn_nntpport);
SET_TOGGLE_SENSITIVITY (checkbtn_nntpport, spinbtn_nntpport);
+ gtk_size_group_add_widget(size_group, checkbtn_nntpport);
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Domain name"));
-
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), checkbtn_domain,
- _("The domain name will be used in the right part of "
- "the generated Message-Ids, and when connecting to "
- "SMTP servers."),
- NULL);
+ gtk_size_group_add_widget(size_group, checkbtn_domain);
+
+ tip_domain = _("The domain name will be used in the generated "
+ "Message-ID, and when connecting to SMTP servers.");
+
+ CLAWS_SET_TIP(checkbtn_domain, tip_domain);
entry_domain = gtk_entry_new ();
gtk_widget_show (entry_domain);
gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), entry_domain,
- _("The domain name will be used in the right part of "
- "the generated Message-Ids, and when connecting to "
- "SMTP servers."),
- NULL);
-
+ CLAWS_SET_TIP(entry_domain, tip_domain);
#ifndef G_OS_WIN32
PACK_HBOX (hbox1);
gtk_box_pack_start (GTK_BOX (hbox1), entry_tunnelcmd, TRUE, TRUE, 0);
SET_TOGGLE_SENSITIVITY (checkbtn_tunnelcmd, entry_tunnelcmd);
#endif
- PACK_HBOX (hbox1);
+
+#if !GTK_CHECK_VERSION(3, 0, 0)
PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost,
_("Mark cross-posted messages as read and color:"));
g_signal_connect (G_OBJECT (checkbtn_crosspost), "toggled",
G_CALLBACK (crosspost_color_toggled),
NULL);
- colormenu_crosspost = gtk_option_menu_new();
+ colormenu_crosspost = gtk_cmoption_menu_new();
gtk_widget_show (colormenu_crosspost);
gtk_box_pack_start (GTK_BOX (hbox1), colormenu_crosspost, FALSE, FALSE, 0);
menu = colorlabel_create_color_menu();
- gtk_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
+ gtk_cmoption_menu_set_menu (GTK_CMOPTION_MENU(colormenu_crosspost), menu);
SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
+#endif
PACK_HBOX (hbox1);
#undef PACK_HBOX
page->nntpport_spinbtn = spinbtn_nntpport;
page->domain_checkbtn = checkbtn_domain;
page->domain_entry = entry_domain;
+#if !GTK_CHECK_VERSION(3, 0, 0)
page->crosspost_checkbtn = checkbtn_crosspost;
page->crosspost_colormenu = colormenu_crosspost;
+#endif
#ifndef G_OS_WIN32
page->tunnelcmd_checkbtn = checkbtn_tunnelcmd;
page->vbox = vbox1;
page->page.widget = vbox1;
+
+ g_object_unref(G_OBJECT(size_group));
}
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) {
GtkWidget *inbox_entry = (protocol == A_POP3 ? receive_page.inbox_entry : receive_page.local_inbox_entry );
const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(inbox_entry));
FolderItem *inbox = folder_find_item_from_identifier(mailbox);
- if (!inbox && create_mailbox) {
+ if (!inbox) {
gchar *id = NULL;
setup_write_mailbox_path(mainwindow_get_mainwindow(), "Mail");
id = folder_item_get_identifier(folder_get_default_inbox_for_class(F_MH));
id);
g_free(id);
mailbox = gtk_entry_get_text(GTK_ENTRY(inbox_entry));
- create_mailbox = FALSE;
inbox = folder_find_item_from_identifier(mailbox);
}
if (inbox == NULL) {
}
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 &&
if (protocol == A_IMAP4 || protocol == A_NNTP)
old_id = g_strdup_printf("#%s/%s",
- protocol == A_IMAP4 ? "imap":"nntp",
+ protocol == A_IMAP4 ? "imap":"news",
tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
prefs_set_data_from_dialog(basic_param);
+
+ /* Passwords are stored outside of PrefParams. */
+ passwd_store_set_account(tmp_ac_prefs.account_id,
+ PWS_ACCOUNT_RECV,
+ gtk_entry_get_text(GTK_ENTRY(basic_page.pass_entry)),
+ FALSE);
if (protocol == A_IMAP4 || protocol == A_NNTP) {
new_id = g_strdup_printf("#%s/%s",
- protocol == A_IMAP4 ? "imap":"nntp",
+ protocol == A_IMAP4 ? "imap":"news",
tmp_ac_prefs.account_name);
if (old_id != NULL && new_id != NULL)
prefs_filtering_rename_path(old_id, new_id);
static gint prefs_send_apply(void)
{
prefs_set_data_from_dialog(send_param);
+
+ /* Passwords are stored outside of PrefParams. */
+ passwd_store_set_account(tmp_ac_prefs.account_id,
+ PWS_ACCOUNT_SEND,
+ gtk_entry_get_text(GTK_ENTRY(send_page.smtp_pass_entry)),
+ FALSE);
+
return 0;
}
return 0;
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static gint prefs_ssl_apply(void)
{
prefs_set_data_from_dialog(ssl_param);
+
+ /* Passwords are stored outside of PrefParams. */
+ passwd_store_set_account(tmp_ac_prefs.account_id,
+ PWS_ACCOUNT_RECV_CERT,
+ gtk_entry_get_text(GTK_ENTRY(ssl_page.entry_in_cert_pass)),
+ FALSE);
+ passwd_store_set_account(tmp_ac_prefs.account_id,
+ PWS_ACCOUNT_SEND_CERT,
+ gtk_entry_get_text(GTK_ENTRY(ssl_page.entry_out_cert_pass)),
+ FALSE);
+
return 0;
}
#endif
/* PrivacyPage *page = (PrivacyPage *) _page; */
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static void ssl_destroy_widget_func(PrefsPage *_page)
{
/* SSLPage *page = (SSLPage *) _page; */
return prefs_privacy_apply() >= 0;
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static gboolean ssl_can_close_func(PrefsPage *_page)
{
SSLPage *page = (SSLPage *) _page;
return;
quotefmt_check_new_msg_formats(tmp_ac_prefs.compose_with_format,
+ NULL,
tmp_ac_prefs.compose_subject_format,
tmp_ac_prefs.compose_body_format);
quotefmt_check_reply_formats(tmp_ac_prefs.reply_with_format,
+ NULL,
tmp_ac_prefs.reply_quotemark,
tmp_ac_prefs.reply_body_format);
quotefmt_check_forward_formats(tmp_ac_prefs.forward_with_format,
+ NULL,
tmp_ac_prefs.forward_quotemark,
tmp_ac_prefs.forward_body_format);
if (prefs_templates_apply() >= 0)
cancelled = FALSE;
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static void ssl_save_func(PrefsPage *_page)
{
SSLPage *page = (SSLPage *) _page;
prefs_account_register_page((PrefsPage *) &privacy_page);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static void register_ssl_page(void)
{
static gchar *path[3];
path[0] = _("Account");
- path[1] = _("SSL");
+ path[1] = _("SSL/TLS");
path[2] = NULL;
ssl_page.page.path = path;
prefs_account_register_page((PrefsPage *) &ssl_page);
}
+
+static gboolean sslcert_get_client_cert_hook(gpointer source, gpointer data)
+{
+ SSLClientCertHookData *hookdata = (SSLClientCertHookData *)source;
+ PrefsAccount *account = (PrefsAccount *)hookdata->account;
+ gchar *pwd_id;
+
+ hookdata->cert_path = NULL;
+ hookdata->password = NULL;
+
+ if (!g_list_find(account_get_list(), account)) {
+ g_warning("can't find account");
+ return TRUE;
+ }
+
+ if (hookdata->is_smtp) {
+ if (account->out_ssl_client_cert_file && *account->out_ssl_client_cert_file)
+ hookdata->cert_path = account->out_ssl_client_cert_file;
+ pwd_id = PWS_ACCOUNT_SEND_CERT;
+ } else {
+ if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
+ hookdata->cert_path = account->in_ssl_client_cert_file;
+ pwd_id = PWS_ACCOUNT_RECV_CERT;
+ }
+
+ hookdata->password = passwd_store_get_account(account->account_id, pwd_id);
+ return TRUE;
+}
+
+struct GetPassData {
+ GCond *cond;
+ GMutex* mutex;
+ gchar **pass;
+};
+
+
+static gboolean do_get_pass(gpointer data)
+{
+ struct GetPassData *pass_data = (struct GetPassData *)data;
+ g_mutex_lock(pass_data->mutex);
+ *(pass_data->pass) = input_dialog_query_password("the PKCS12 client certificate", NULL);
+ g_cond_signal(pass_data->cond);
+ g_mutex_unlock(pass_data->mutex);
+ return FALSE;
+}
+static gboolean sslcert_get_password(gpointer source, gpointer data)
+{
+ struct GetPassData pass_data;
+ /* do complicated stuff to be able to call GTK from the mainloop */
+#if !GLIB_CHECK_VERSION(2,32,0)
+ pass_data.cond = g_cond_new();
+#else
+ pass_data.cond = g_new0(GCond, 1);
+ g_cond_init(pass_data.cond);
+#endif
+ pass_data.mutex = cm_mutex_new();
+ pass_data.pass = (gchar **)source;
+
+ g_mutex_lock(pass_data.mutex);
+
+ g_idle_add(do_get_pass, &pass_data);
+
+ g_cond_wait(pass_data.cond, pass_data.mutex);
+#if !GLIB_CHECK_VERSION(2,32,0)
+ g_cond_free(pass_data.cond);
+#else
+ g_cond_clear(pass_data.cond);
+ g_free(pass_data.cond);
+#endif
+ g_mutex_unlock(pass_data.mutex);
+ cm_mutex_free(pass_data.mutex);
+
+ return TRUE;
+}
#endif
static void register_advanced_page(void)
register_compose_page();
register_templates_page();
register_privacy_page();
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
register_ssl_page();
+ hooks_register_hook(SSLCERT_GET_CLIENT_CERT_HOOKLIST, sslcert_get_client_cert_hook, NULL);
+ hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);
#endif
register_advanced_page();
}
gchar *rcpath;
gint id;
gchar **strv, **cur;
+ gsize len;
- g_return_if_fail(ac_prefs != NULL);
- g_return_if_fail(label != NULL);
+ cm_return_if_fail(ac_prefs != NULL);
+ cm_return_if_fail(label != NULL);
memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
*ac_prefs = tmp_ac_prefs;
while (*p && !g_ascii_isdigit(*p)) p++;
id = atoi(p);
- if (id < 0) g_warning("wrong account id: %d\n", id);
+ if (id < 0) g_warning("wrong account id: %d", id);
ac_prefs->account_id = id;
- if (ac_prefs->protocol == A_APOP) {
- debug_print("converting protocol A_APOP to new prefs.\n");
- ac_prefs->protocol = A_POP3;
- ac_prefs->use_apop_auth = TRUE;
- }
-
if (privacy_prefs != NULL) {
strv = g_strsplit(privacy_prefs, ",", 0);
for (cur = strv; *cur != NULL; cur++) {
- gchar *encvalue, *value;
+ gchar *encvalue, *tmp;
encvalue = strchr(*cur, '=');
if (encvalue == NULL)
encvalue[0] = '\0';
encvalue++;
- value = g_malloc0(strlen(encvalue));
- if (base64_decode(value, encvalue, strlen(encvalue)) > 0)
- g_hash_table_insert(ac_prefs->privacy_prefs, g_strdup(*cur), g_strdup(value));
- g_free(value);
+ tmp = g_base64_decode_zero(encvalue, &len);
+ if (len > 0)
+ g_hash_table_insert(ac_prefs->privacy_prefs, g_strdup(*cur), tmp);
+ else
+ g_free(tmp);
}
g_strfreev(strv);
g_free(privacy_prefs);
privacy_prefs = NULL;
}
+ gboolean passwords_migrated = FALSE;
+
+ if (ac_prefs->passwd != NULL && strlen(ac_prefs->passwd) > 1) {
+ passwd_store_set_account(ac_prefs->account_id,
+ PWS_ACCOUNT_RECV, ac_prefs->passwd, TRUE);
+ passwords_migrated = TRUE;
+ }
+ if (ac_prefs->smtp_passwd != NULL && strlen(ac_prefs->smtp_passwd) > 1) {
+ passwd_store_set_account(ac_prefs->account_id,
+ PWS_ACCOUNT_SEND, ac_prefs->smtp_passwd, TRUE);
+ passwords_migrated = TRUE;
+ }
+ if (ac_prefs->in_ssl_client_cert_pass != NULL
+ && strlen(ac_prefs->in_ssl_client_cert_pass) > 1) {
+ passwd_store_set_account(ac_prefs->account_id,
+ PWS_ACCOUNT_RECV_CERT, ac_prefs->in_ssl_client_cert_pass, TRUE);
+ passwords_migrated = TRUE;
+ }
+ if (ac_prefs->out_ssl_client_cert_pass != NULL
+ && strlen(ac_prefs->out_ssl_client_cert_pass) > 1) {
+ passwd_store_set_account(ac_prefs->account_id,
+ PWS_ACCOUNT_SEND_CERT, ac_prefs->out_ssl_client_cert_pass, TRUE);
+ passwords_migrated = TRUE;
+ }
+
+ /* Write out password store to file immediately after their move
+ * from accountrc there. */
+ if (passwords_migrated)
+ passwd_store_write_config();
+
+ ac_prefs->receive_in_progress = FALSE;
+
prefs_custom_header_read_config(ac_prefs);
}
if (str->len > 0)
g_string_append_c(str, ',');
- encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
- base64_encode(encvalue, (gchar *) value, strlen(value));
+ encvalue = g_base64_encode(value, strlen(value));
g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
g_free(encvalue);
}
#define WRITE_PARAM(PARAM_TABLE) \
if (prefs_write_param(PARAM_TABLE, pfile->fp) < 0) { \
- g_warning("failed to write configuration to file\n"); \
+ g_warning("failed to write configuration to file"); \
prefs_file_close_revert(pfile); \
g_free(privacy_prefs); \
privacy_prefs = NULL; \
}
if (prefs_file_close(pfile) < 0)
- g_warning("failed to write configuration to file\n");
+ g_warning("failed to write configuration to file");
+
+ passwd_store_write_config();
}
#undef WRITE_PARAM
prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
&prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height,
- TRUE, TRUE);
+ TRUE, NULL, NULL, NULL);
g_free(title);
gtk_main();
if (!cancelled && dirty != NULL)
*dirty = TRUE;
- if (cancelled && new_account) {
- prefs_account_free(ac_prefs);
+ if (cancelled && new_account)
return NULL;
- } else
+ else {
+ if (ac_prefs->recv_server)
+ g_strstrip(ac_prefs->recv_server);
+ if (ac_prefs->smtp_server)
+ g_strstrip(ac_prefs->smtp_server);
+ if (ac_prefs->nntp_server)
+ g_strstrip(ac_prefs->nntp_server);
+
return ac_prefs;
+ }
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void crosspost_color_toggled(void)
{
gboolean is_active;
GtkWidget *menu;
GtkWidget *menuitem;
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced_page.crosspost_colormenu));
+ menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(advanced_page.crosspost_colormenu));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
*((gint *)pparam->data) = GPOINTER_TO_INT
(g_object_get_data(G_OBJECT(menuitem), "color"));
static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
{
gint colorlabel = *((gint *)pparam->data);
- GtkOptionMenu *colormenu = GTK_OPTION_MENU(*pparam->widget);
+ GtkCMOptionMenu *colormenu = GTK_CMOPTION_MENU(*pparam->widget);
GtkWidget *menu;
GtkWidget *menuitem;
- gtk_option_menu_set_history(colormenu, colorlabel);
- menu = gtk_option_menu_get_menu(colormenu);
+ gtk_cmoption_menu_set_history(colormenu, colorlabel + 1);
+ menu = gtk_cmoption_menu_get_menu(colormenu);
menuitem = gtk_menu_get_active(GTK_MENU(menu));
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
+#endif
static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
{
}
}
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_cb (GtkWidget *widget, gpointer data)
+{
+ gchar *address = NULL;
+ AutoConfigureData *recv_data;
+ AutoConfigureData *send_data;
+ static GCancellable *recv_cancel = NULL;
+ static GCancellable *send_cancel = NULL;
+ RecvProtocol protocol;
+ struct BasicProtocol *protocol_optmenu = (struct BasicProtocol *) basic_page.protocol_optmenu;
+ GtkWidget *optmenu = protocol_optmenu->combobox;
+
+ if (!recv_cancel) {
+ recv_cancel = g_cancellable_new();
+ send_cancel = g_cancellable_new();
+ }
+
+ if (widget == basic_page.auto_configure_cancel_btn) {
+ g_cancellable_cancel(recv_cancel);
+ g_cancellable_cancel(send_cancel);
+ g_object_unref(recv_cancel);
+ g_object_unref(send_cancel);
+ recv_cancel = NULL;
+ send_cancel = NULL;
+ return;
+ }
+
+ protocol = combobox_get_active_data(GTK_COMBO_BOX(optmenu));
+
+ address = gtk_editable_get_chars(GTK_EDITABLE(basic_page.addr_entry), 0, -1);
+
+ if (strchr(address, '@') == NULL) {
+ g_free(address);
+ gtk_label_set_text(GTK_LABEL(basic_page.auto_configure_lbl),
+ _("Failed (wrong address)"));
+ return;
+ }
+
+ if (protocol == A_POP3 || protocol == A_IMAP4) {
+ recv_data = g_new0(AutoConfigureData, 1);
+ recv_data->configure_button = GTK_BUTTON(basic_page.auto_configure_btn);
+ recv_data->cancel_button = GTK_BUTTON(basic_page.auto_configure_cancel_btn);
+ recv_data->info_label = GTK_LABEL(basic_page.auto_configure_lbl);
+ recv_data->cancel = recv_cancel;
+ switch(protocol) {
+ case A_POP3:
+ recv_data->ssl_service = "pop3s";
+ recv_data->tls_service = "pop3";
+ recv_data->address = g_strdup(address);
+ recv_data->hostname_entry = GTK_ENTRY(basic_page.recvserv_entry);
+ recv_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.popport_checkbtn);
+ recv_data->port = GTK_SPIN_BUTTON(advanced_page.popport_spinbtn);
+ recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.pop_starttls_radiobtn);
+ recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.pop_ssltunnel_radiobtn);
+ recv_data->default_port = 110;
+ recv_data->default_ssl_port = 995;
+ recv_data->uid_entry = GTK_ENTRY(basic_page.uid_entry);
+ break;
+ case A_IMAP4:
+ recv_data->ssl_service = "imaps";
+ recv_data->tls_service = "imap";
+ recv_data->address = g_strdup(address);
+ recv_data->hostname_entry = GTK_ENTRY(basic_page.recvserv_entry);
+ recv_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.imapport_checkbtn);
+ recv_data->port = GTK_SPIN_BUTTON(advanced_page.imapport_spinbtn);
+ recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.imap_starttls_radiobtn);
+ recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.imap_ssltunnel_radiobtn);
+ recv_data->default_port = 143;
+ recv_data->default_ssl_port = 993;
+ recv_data->uid_entry = GTK_ENTRY(basic_page.uid_entry);
+ break;
+ default:
+ cm_return_if_fail(FALSE);
+ }
+ auto_configure_service(recv_data);
+ }
+
+ send_data = g_new0(AutoConfigureData, 1);
+ send_data->configure_button = GTK_BUTTON(basic_page.auto_configure_btn);
+ send_data->cancel_button = GTK_BUTTON(basic_page.auto_configure_cancel_btn);
+ send_data->info_label = GTK_LABEL(basic_page.auto_configure_lbl);
+ send_data->cancel = send_cancel;
+
+ send_data->ssl_service = NULL;
+ send_data->tls_service = "submission";
+ send_data->address = g_strdup(address);
+ send_data->hostname_entry = GTK_ENTRY(basic_page.smtpserv_entry);
+ send_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.smtpport_checkbtn);
+ send_data->port = GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn);
+ send_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.smtp_starttls_radiobtn);
+ send_data->ssl_checkbtn = NULL;
+ send_data->default_port = 25;
+ send_data->default_ssl_port = -1;
+ send_data->uid_entry = NULL;
+ send_data->auth_checkbtn = GTK_TOGGLE_BUTTON(send_page.smtp_auth_checkbtn);
+
+ auto_configure_service(send_data);
+
+ g_free(address);
+}
+#endif
+
static void prefs_account_sigfile_radiobtn_cb(GtkWidget *widget, gpointer data)
{
gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), TRUE);
g_free(utf8_filename);
}
+#ifdef USE_GNUTLS
+static void prefs_account_in_cert_browse_cb(GtkWidget *widget, gpointer data)
+{
+ gchar *filename;
+ gchar *utf8_filename;
+
+ filename = filesel_select_file_open(_("Select certificate file"), NULL);
+ if (!filename) return;
+
+ utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+ if (!utf8_filename) {
+ g_warning("prefs_account_cert_browse_cb(): failed to convert character set.");
+ utf8_filename = g_strdup(filename);
+ }
+ gtk_entry_set_text(GTK_ENTRY(entry_in_cert_file), utf8_filename);
+ g_free(utf8_filename);
+}
+
+static void prefs_account_out_cert_browse_cb(GtkWidget *widget, gpointer data)
+{
+ gchar *filename;
+ gchar *utf8_filename;
+
+ filename = filesel_select_file_open(_("Select certificate file"), NULL);
+ if (!filename) return;
+
+ utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+ if (!utf8_filename) {
+ g_warning("prefs_account_cert_browse_cb(): failed to convert character set.");
+ utf8_filename = g_strdup(filename);
+ }
+ gtk_entry_set_text(GTK_ENTRY(entry_out_cert_file), utf8_filename);
+ g_free(utf8_filename);
+}
+#endif
+
static void prefs_account_signature_edit_cb(GtkWidget *widget, gpointer data)
{
const gchar *sigpath = gtk_entry_get_text(GTK_ENTRY(data));
GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
TRUE);
gtk_widget_hide(send_page.msgid_checkbtn);
- } else {
+ } else
gtk_widget_show(send_page.msgid_checkbtn);
- }
+
+ gtk_widget_show(send_page.xmailer_checkbtn);
}
}
GtkTreeIter iter;
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
combobox = *pparam->widget;
- g_return_if_fail(gtk_combo_box_get_active_iter(
+ cm_return_if_fail(gtk_combo_box_get_active_iter(
GTK_COMBO_BOX(combobox), &iter));
str = (gchar **)pparam->data;
gchar *prefsid;
PrivacySystemSetCtx *ctx = NULL;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
prefsid = *((gchar **) pparam->data);
if (prefsid == NULL)
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
+
switch(protocol) {
case A_NNTP:
#ifndef HAVE_LIBETPAN
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
#endif
gtk_widget_show(send_page.msgid_checkbtn);
+ gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_show(basic_page.nntpserv_label);
gtk_widget_show(basic_page.nntpserv_entry);
gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
FALSE);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
gtk_widget_show(ssl_page.nntp_frame);
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_show(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_show(advanced_page.crosspost_checkbtn);
gtk_widget_show(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
break;
case A_LOCAL:
gtk_widget_show(send_page.msgid_checkbtn);
+ gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
gtk_widget_hide(basic_page.nntpserv_label);
TRUE);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
TRUE);
gtk_widget_hide(send_page.msgid_checkbtn);
+ gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(basic_page.nntpserv_label);
gtk_widget_hide(basic_page.nntpserv_entry);
gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
FALSE);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_show(ssl_page.imap_frame);
gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_show(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_show(advanced_page.tunnelcmd_checkbtn);
gtk_widget_show(advanced_page.tunnelcmd_entry);
break;
case A_NONE:
gtk_widget_show(send_page.msgid_checkbtn);
+ gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
gtk_widget_hide(basic_page.nntpserv_label);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn), FALSE);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_hide(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
break;
case A_POP3:
+ /* continue to default: */
default:
gtk_widget_show(send_page.msgid_checkbtn);
+ gtk_widget_show(send_page.xmailer_checkbtn);
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
gtk_widget_hide(basic_page.nntpserv_label);
TRUE);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_show(ssl_page.pop_frame);
gtk_widget_hide(ssl_page.imap_frame);
gtk_widget_hide(ssl_page.nntp_frame);
gtk_widget_show(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
{
gboolean auth;
- if (!GTK_WIDGET_SENSITIVE (GTK_WIDGET (button)))
+ if (!gtk_widget_get_sensitive (GTK_WIDGET (button)))
return;
auth = gtk_toggle_button_get_active (button);
gtk_widget_set_sensitive(basic_page.uid_label, auth);
gtk_widget_set_sensitive(receive_page.filterhook_on_recv_checkbtn, do_filter);
}
-#if USE_ASPELL
+#if USE_ENCHANT
static void prefs_account_compose_default_dictionary_set_string_from_optmenu
(PrefParam *pparam)
{
GtkWidget *combo;
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
combo = *pparam->widget;
str = (gchar **) pparam->data;
GtkWidget *combo;
gchar *dictionary;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
dictionary = *((gchar **) pparam->data);
- if (dictionary == NULL)
- return;
+ if (dictionary != NULL) {
+ if (strrchr(dictionary, '/')) {
+ dictionary = g_strdup(strrchr(dictionary, '/')+1);
+ }
+ if (strchr(dictionary, '-')) {
+ *(strchr(dictionary, '-')) = '\0';
+ }
+ }
combo = *pparam->widget;
- if (dictionary)
+ if (dictionary && *dictionary)
gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo),
dictionary);
+ else {
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ if((model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo))) == NULL)
+ return;
+ if((gtk_tree_model_get_iter_first(model, &iter)) == FALSE)
+ return;
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
+ }
}
#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);
projects / claws.git / blobdiff