/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * 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 "combobox.h"
#include "setup.h"
#include "quote_fmt.h"
+#include "hooks.h"
+#include "privacy.h"
+#include "inputdialog.h"
+#include "ssl_certificate.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 *pop3_frame;
GtkWidget *use_apop_checkbtn;
GtkWidget *rmmail_checkbtn;
- GtkWidget *leave_time_entry;
+ GtkWidget *leave_time_spinbtn;
+ GtkWidget *leave_hour_spinbtn;
GtkWidget *size_limit_checkbtn;
- GtkWidget *size_limit_entry;
+ GtkWidget *size_limit_spinbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
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 *smtp_pass_entry;
GtkWidget *pop_bfr_smtp_checkbtn;
- GtkWidget *pop_bfr_smtp_tm_entry;
+ GtkWidget *pop_bfr_smtp_tm_spinbtn;
GtkWidget *pop_auth_timeout_lbl;
GtkWidget *pop_auth_minutes_lbl;
} SendPage;
GtkWidget *autobcc_entry;
GtkWidget *autoreplyto_checkbtn;
GtkWidget *autoreplyto_entry;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkWidget *checkbtn_enable_default_dictionary;
- GtkWidget *optmenu_default_dictionary;
+ GtkWidget *combo_default_dictionary;
GtkWidget *checkbtn_enable_default_alt_dictionary;
- GtkWidget *optmenu_default_alt_dictionary;
+ GtkWidget *combo_default_alt_dictionary;
#endif
} ComposePage;
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 *use_nonblocking_ssl_checkbtn;
} SSLPage;
GtkWidget *vbox;
GtkWidget *smtpport_checkbtn;
- GtkWidget *smtpport_entry;
+ GtkWidget *smtpport_spinbtn;
GtkWidget *popport_hbox;
GtkWidget *popport_checkbtn;
- GtkWidget *popport_entry;
+ GtkWidget *popport_spinbtn;
GtkWidget *imapport_hbox;
GtkWidget *imapport_checkbtn;
- GtkWidget *imapport_entry;
+ GtkWidget *imapport_spinbtn;
GtkWidget *nntpport_hbox;
GtkWidget *nntpport_checkbtn;
- GtkWidget *nntpport_entry;
+ 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;
GtkWidget *tunnelcmd_entry;
+#endif
GtkWidget *sent_folder_checkbtn;
GtkWidget *sent_folder_entry;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_checkbtn;
GtkWidget *trash_folder_entry;
+ GtkWidget *imap_use_trash_checkbtn;
} AdvancedPage;
static BasicPage basic_page;
static ComposePage compose_page;
static TemplatesPage templates_page;
static PrivacyPage privacy_page;
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
static SSLPage ssl_page;
#endif
static AdvancedPage advanced_page;
static void prefs_account_protocol_changed (GtkComboBox *combobox,
gpointer data);
-static void prefs_account_set_string_from_optmenu (PrefParam *pparam);
-static void prefs_account_set_optmenu_from_string (PrefParam *pparam);
+static void prefs_account_set_string_from_combobox (PrefParam *pparam);
+static void prefs_account_set_privacy_combobox_from_string (PrefParam *pparam);
static void prefs_account_imap_auth_type_set_data_from_optmenu
(PrefParam *pparam);
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
&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_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &receive_page.leave_time_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
#else
{"message_leave_time", "30", &tmp_ac_prefs.msg_leave_time, P_INT,
- &receive_page.leave_time_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &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,
prefs_set_data_from_toggle, prefs_set_toggle},
{"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT,
- &receive_page.size_limit_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &receive_page.size_limit_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
&receive_page.filter_on_recv_checkbtn,
&receive_page.subsonly_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"low_bandwidth", "TRUE", &tmp_ac_prefs.low_bandwidth, P_BOOL,
+ {"low_bandwidth", "FALSE", &tmp_ac_prefs.low_bandwidth, P_BOOL,
&receive_page.low_bandwidth_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
&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},
prefs_set_data_from_toggle, prefs_set_toggle},
{"pop_before_smtp_timeout", "5", &tmp_ac_prefs.pop_before_smtp_timeout, P_INT,
- &send_page.pop_bfr_smtp_tm_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &send_page.pop_bfr_smtp_tm_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
&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_dictionary", NULL, &tmp_ac_prefs.default_dictionary, P_STRING,
- &compose_page.optmenu_default_dictionary,
+ &compose_page.combo_default_dictionary,
prefs_account_compose_default_dictionary_set_string_from_optmenu,
prefs_account_compose_default_dictionary_set_optmenu_from_string},
prefs_set_data_from_toggle, prefs_set_toggle},
{"default_alt_dictionary", NULL, &tmp_ac_prefs.default_alt_dictionary, P_STRING,
- &compose_page.optmenu_default_alt_dictionary,
+ &compose_page.combo_default_alt_dictionary,
prefs_account_compose_default_dictionary_set_string_from_optmenu,
prefs_account_compose_default_dictionary_set_optmenu_from_string},
#else
static PrefParam privacy_param[] = {
{"default_privacy_system", "", &tmp_ac_prefs.default_privacy_system, P_STRING,
&privacy_page.default_privacy_system,
- prefs_account_set_string_from_optmenu, prefs_account_set_optmenu_from_string},
+ prefs_account_set_string_from_combobox,
+ prefs_account_set_privacy_combobox_from_string},
{"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
&privacy_page.default_encrypt_checkbtn,
{"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 USE_OPENSSL
+#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,
{"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,
+ &ssl_page.entry_in_cert_pass, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"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,
+ &ssl_page.entry_out_cert_pass, prefs_set_data_from_entry, prefs_set_entry},
#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},
+
{"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}
};
prefs_set_data_from_toggle, prefs_set_toggle},
{"smtp_port", "25", &tmp_ac_prefs.smtpport, P_USHORT,
- &advanced_page.smtpport_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &advanced_page.smtpport_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"set_popport", "FALSE", &tmp_ac_prefs.set_popport, P_BOOL,
&advanced_page.popport_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"pop_port", "110", &tmp_ac_prefs.popport, P_USHORT,
- &advanced_page.popport_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &advanced_page.popport_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"set_imapport", "FALSE", &tmp_ac_prefs.set_imapport, P_BOOL,
&advanced_page.imapport_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"imap_port", "143", &tmp_ac_prefs.imapport, P_USHORT,
- &advanced_page.imapport_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &advanced_page.imapport_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"set_nntpport", "FALSE", &tmp_ac_prefs.set_nntpport, P_BOOL,
&advanced_page.nntpport_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"nntp_port", "119", &tmp_ac_prefs.nntpport, P_USHORT,
- &advanced_page.nntpport_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ &advanced_page.nntpport_spinbtn,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"set_domain", "FALSE", &tmp_ac_prefs.set_domain, P_BOOL,
&advanced_page.domain_checkbtn,
&advanced_page.domain_entry,
prefs_set_data_from_entry, prefs_set_entry},
+#ifndef G_OS_WIN32
{"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
&advanced_page.tunnelcmd_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"tunnelcmd", NULL, &tmp_ac_prefs.tunnelcmd, P_STRING,
&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},
+
+ {"imap_use_trash", "TRUE", &tmp_ac_prefs.imap_use_trash, P_BOOL,
+ &advanced_page.imap_use_trash_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{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 prefs_account_edit_custom_header (void);
-static void privacy_system_activated(GtkMenuItem *menuitem)
+
+#define COMBOBOX_PRIVACY_PLUGIN_ID 3
+
+/* Enable/disable necessary preference widgets based on current privacy
+ * system choice. */
+static void privacy_system_activated(GtkWidget *combobox)
{
- const gchar* system_id;
- gboolean privacy_enabled = FALSE;
-
- system_id = g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
-
- privacy_enabled = strcmp(system_id, "");
+ const gchar *system_id;
+ gint privacy_enabled_int;
+ GtkTreeIter iter;
+ GtkListStore *menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(combobox)));
- if (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_DATA) == NULL ||
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_DATA)) == FALSE)
- privacy_enabled = FALSE;
+ gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter);
- 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_tree_model_get(GTK_TREE_MODEL(menu), &iter,
+ COMBOBOX_PRIVACY_PLUGIN_ID, &system_id,
+ COMBOBOX_DATA, &privacy_enabled_int,
+ -1);
+
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 */
static void update_privacy_system_menu() {
- GtkWidget *menu;
- GtkWidget *menuitem;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GSList *system_ids, *cur;
- menu = gtk_menu_new();
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(privacy_page.default_privacy_system)));
- menuitem = gtk_menu_item_new_with_label(_("None"));
- gtk_widget_show(menuitem);
- g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");
- g_object_set_data(G_OBJECT(menuitem), MENU_VAL_DATA, GINT_TO_POINTER(FALSE));
- gtk_menu_append(GTK_MENU(menu), menuitem);
-
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(privacy_system_activated),
- NULL);
+ /* First add "None", as that one is always available. :) */
+ gtk_list_store_append(menu, &iter);
+ gtk_list_store_set(menu, &iter,
+ COMBOBOX_TEXT, _("None"),
+ COMBOBOX_DATA, 0,
+ COMBOBOX_SENS, TRUE,
+ COMBOBOX_PRIVACY_PLUGIN_ID, "",
+ -1);
+ /* Now go through list of available privacy systems and add an entry
+ * for each. */
system_ids = privacy_get_system_ids();
for (cur = system_ids; cur != NULL; cur = g_slist_next(cur)) {
gchar *id = (gchar *) cur->data;
const gchar *name;
name = privacy_system_get_name(id);
- menuitem = gtk_menu_item_new_with_label(name);
- gtk_widget_show(menuitem);
- g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, id, g_free);
- g_object_set_data(G_OBJECT(menuitem), MENU_VAL_DATA, GINT_TO_POINTER(TRUE));
-
- gtk_menu_append(GTK_MENU(menu), menuitem);
-
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(privacy_system_activated),
- NULL);
-
-
+ gtk_list_store_append(menu, &iter);
+ gtk_list_store_set(menu, &iter,
+ COMBOBOX_TEXT, name,
+ COMBOBOX_DATA, 1,
+ COMBOBOX_SENS, TRUE,
+ COMBOBOX_PRIVACY_PLUGIN_ID, id,
+ -1);
}
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(privacy_page.default_privacy_system), menu);
}
#define TABLE_YPAD 2
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);
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 support.</span>"));
+ "has been built without IMAP and News support.</span>"));
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->uid_entry = uid_entry;
page->pass_entry = pass_entry;
- create_mailbox = FALSE;
if (new_account) {
PrefsAccount *def_ac;
gchar *buf;
gtk_entry_set_text(GTK_ENTRY(receive_page.local_inbox_entry),
id);
g_free(id);
- } else {
- create_mailbox = TRUE;
}
}
} else
GtkWidget *use_apop_checkbtn;
GtkWidget *rmmail_checkbtn;
GtkWidget *hbox_spc;
- GtkTooltips *leave_time_tooltip;
GtkWidget *leave_time_label;
- GtkWidget *leave_time_entry;
+ GtkWidget *leave_time_spinbtn;
+ GtkWidget *leave_hour_label;
+ GtkWidget *leave_hour_spinbtn;
GtkWidget *hbox1;
GtkWidget *size_limit_checkbtn;
- GtkWidget *size_limit_entry;
- GtkTooltips *size_limit_tooltip;
+ GtkWidget *size_limit_spinbtn;
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 *local_inbox_btn;
GtkWidget *optmenu;
- GtkWidget *optmenu_menu;
- GtkWidget *menuitem;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GtkWidget *recvatgetall_checkbtn;
GtkWidget *hbox2;
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);
gtk_widget_show (local_hbox);
gtk_box_pack_start (GTK_BOX (local_vbox), local_hbox, FALSE, FALSE, 0);
- local_inbox_label = gtk_label_new (_("Default inbox"));
+ local_inbox_label = gtk_label_new (_("Default Inbox"));
gtk_widget_show (local_inbox_label);
gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_label, FALSE, FALSE, 0);
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),
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_entry = gtk_entry_new ();
- gtk_widget_show (leave_time_entry);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(leave_time_tooltip), leave_time_entry,
- _("0 days: remove immediately"), NULL);
- gtk_widget_set_size_request (leave_time_entry, 64, -1);
- gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 0);
+ leave_time_spinbtn = gtk_spin_button_new_with_range(0, 365, 1);
+ gtk_widget_show (leave_time_spinbtn);
+ 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_entry = gtk_entry_new ();
- gtk_widget_show (size_limit_entry);
- gtk_widget_set_size_request (size_limit_entry, 64, -1);
- gtk_box_pack_start (GTK_BOX (hbox1), size_limit_entry, FALSE, FALSE, 0);
+ size_limit_spinbtn = gtk_spin_button_new_with_range(0, 100000, 1);
+ gtk_widget_show (size_limit_spinbtn);
+ gtk_box_pack_start (GTK_BOX (hbox1), size_limit_spinbtn, FALSE, FALSE, 0);
label = gtk_label_new (_("KB"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY (size_limit_checkbtn, size_limit_entry);
+ SET_TOGGLE_SENSITIVITY (size_limit_checkbtn, size_limit_spinbtn);
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
- inbox_label = gtk_label_new (_("Default inbox"));
+ inbox_label = gtk_label_new (_("Default Inbox"));
gtk_widget_show (inbox_label);
gtk_box_pack_start (GTK_BOX (hbox1), inbox_label, FALSE, FALSE, 0);
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_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- optmenu = gtk_option_menu_new ();
+
+ optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
gtk_widget_show (optmenu);
gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
- optmenu_menu = gtk_menu_new ();
-
- MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
- MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", IMAP_AUTH_LOGIN);
- MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
- MENUITEM_ADD (optmenu_menu, menuitem, "ANONYMOUS", IMAP_AUTH_ANON);
- MENUITEM_ADD (optmenu_menu, menuitem, "GSSAPI", IMAP_AUTH_GSSAPI);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+ COMBOBOX_ADD (menu, _("Automatic"), 0);
+ COMBOBOX_ADD (menu, NULL, 0);
+ COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
+ 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);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
PACK_CHECK_BUTTON (hbox1, low_bandwidth_checkbtn,
- _("Bandwidth-efficient mode"));
- gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), low_bandwidth_checkbtn,
- _("This mode uses less bandwidth, but can be slower with some servers."),
- NULL);
+ _("Bandwidth-efficient mode (prevents retrieving remote tags)"));
+ 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"));
NULL);
PACK_CHECK_BUTTON (vbox1, filterhook_on_recv_checkbtn,
- _("Allow filtering using plug-ins on receiving"));
+ _("Allow filtering using plugins on receiving"));
PACK_CHECK_BUTTON
(vbox1, recvatgetall_checkbtn,
page->pop3_frame = frame1;
page->use_apop_checkbtn = use_apop_checkbtn;
page->rmmail_checkbtn = rmmail_checkbtn;
- page->leave_time_entry = leave_time_entry;
+ page->leave_time_spinbtn = leave_time_spinbtn;
+ page->leave_hour_spinbtn = leave_hour_spinbtn;
page->size_limit_checkbtn = size_limit_checkbtn;
- page->size_limit_entry = size_limit_entry;
+ page->size_limit_spinbtn = size_limit_spinbtn;
page->filter_on_recv_checkbtn = filter_on_recv_checkbtn;
page->filterhook_on_recv_checkbtn = filterhook_on_recv_checkbtn;
page->inbox_label = inbox_label;
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 *optmenu_menu;
- GtkWidget *menuitem;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GtkWidget *vbox4;
GtkWidget *hbox_spc;
GtkWidget *label;
GtkWidget *smtp_pass_entry;
GtkWidget *vbox_spc;
GtkWidget *pop_bfr_smtp_checkbtn;
- GtkWidget *pop_bfr_smtp_tm_entry;
+ GtkWidget *pop_bfr_smtp_tm_spinbtn;
GtkWidget *pop_auth_timeout_lbl;
GtkWidget *pop_auth_minutes_lbl;
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,
+ _("Generate X-Mailer header"));
+
hbox = gtk_hbox_new (FALSE, 12);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- optmenu = gtk_option_menu_new ();
+ optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
gtk_widget_show (optmenu);
gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
- optmenu_menu = gtk_menu_new ();
-
- MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
- MENUITEM_ADD (optmenu_menu, menuitem, "PLAIN", SMTPAUTH_PLAIN);
- MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", SMTPAUTH_LOGIN);
- MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
- MENUITEM_ADD (optmenu_menu, menuitem, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
- gtk_widget_set_sensitive (menuitem, FALSE);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+ 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);
+ COMBOBOX_ADD (menu, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
+ gtk_list_store_set(menu, &iter, COMBOBOX_SENS, FALSE, -1);
PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
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);
gtk_widget_show (pop_auth_timeout_lbl);
gtk_box_pack_start (GTK_BOX (hbox), pop_auth_timeout_lbl, FALSE, FALSE, 0);
- pop_bfr_smtp_tm_entry = gtk_entry_new ();
- gtk_widget_show (pop_bfr_smtp_tm_entry);
- gtk_widget_set_size_request (pop_bfr_smtp_tm_entry, 30, -1);
- gtk_box_pack_start (GTK_BOX (hbox), pop_bfr_smtp_tm_entry, FALSE, FALSE, 0);
+ pop_bfr_smtp_tm_spinbtn = gtk_spin_button_new_with_range(0, 1440, 1);
+ gtk_widget_show (pop_bfr_smtp_tm_spinbtn);
+ gtk_box_pack_start (GTK_BOX (hbox), pop_bfr_smtp_tm_spinbtn, FALSE, FALSE, 0);
pop_auth_minutes_lbl = gtk_label_new(_("minutes"));
gtk_widget_show (pop_auth_minutes_lbl);
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;
page->smtp_uid_entry = smtp_uid_entry;
page->smtp_pass_entry = smtp_pass_entry;
page->pop_bfr_smtp_checkbtn = pop_bfr_smtp_checkbtn;
- page->pop_bfr_smtp_tm_entry = pop_bfr_smtp_tm_entry;
+ page->pop_bfr_smtp_tm_spinbtn = pop_bfr_smtp_tm_spinbtn;
page->pop_auth_timeout_lbl = pop_auth_timeout_lbl;
page->pop_auth_minutes_lbl = pop_auth_minutes_lbl;
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;
- GtkWidget *optmenu_default_dictionary = NULL;
+ GtkWidget *combo_default_dictionary = NULL;
GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
- GtkWidget *optmenu_default_alt_dictionary = NULL;
+ GtkWidget *combo_default_alt_dictionary = NULL;
#endif
vbox1 = gtk_vbox_new (FALSE, VSPACING);
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);
- optmenu_default_dictionary = gtk_option_menu_new();
- gtk_table_attach(GTK_TABLE(table_dict), optmenu_default_dictionary, 1, 2,
+ 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_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_dictionary),
- gtkaspell_dictionary_option_menu_new(
- prefs_common.aspell_path));
-
- SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, optmenu_default_dictionary);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, combo_default_dictionary);
/* Default dictionary */
checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
tmp_ac_prefs.enable_default_alt_dictionary);
- optmenu_default_alt_dictionary = gtk_option_menu_new();
- gtk_table_attach(GTK_TABLE(table_dict), optmenu_default_alt_dictionary, 1, 2,
+ 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);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_alt_dictionary),
- gtkaspell_dictionary_option_menu_new_with_refresh(
- prefs_common.aspell_path, FALSE));
-
- SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, optmenu_default_alt_dictionary);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, combo_default_alt_dictionary);
gtk_widget_show_all(table_dict);
#endif
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->optmenu_default_dictionary = optmenu_default_dictionary;
+ page->combo_default_dictionary = combo_default_dictionary;
page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
- page->optmenu_default_alt_dictionary = optmenu_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.optmenu_default_dictionary != NULL) {
- gtk_option_menu_remove_menu(GTK_OPTION_MENU(compose_page.optmenu_default_dictionary));
- gtk_option_menu_set_menu(GTK_OPTION_MENU(compose_page.optmenu_default_dictionary),
- gtkaspell_dictionary_option_menu_new(
- prefs_common.aspell_path));
- gtk_option_menu_remove_menu(GTK_OPTION_MENU(compose_page.optmenu_default_alt_dictionary));
- gtk_option_menu_set_menu(GTK_OPTION_MENU(compose_page.optmenu_default_alt_dictionary),
- gtkaspell_dictionary_option_menu_new_with_refresh(
- prefs_common.aspell_path, FALSE));
+ if (compose_page.combo_default_dictionary != NULL) {
+ gtk_combo_box_set_model(GTK_COMBO_BOX(compose_page.combo_default_dictionary),
+ gtkaspell_dictionary_store_new());
+ gtk_combo_box_set_model(GTK_COMBO_BOX(compose_page.combo_default_alt_dictionary),
+ gtkaspell_dictionary_store_new_with_refresh(
+ FALSE));
}
#endif
TemplatesPage *page = (TemplatesPage *) _page;
PrefsAccount *ac_prefs = (PrefsAccount *) data;
GtkWidget *vbox;
+ GtkWidget *vbox2;
+ GtkWidget *notebook;
- vbox = gtk_vbox_new(FALSE, VSPACING);
+ vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
+
+ notebook = gtk_notebook_new();
+ gtk_widget_show(notebook);
+ gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
+
+ /* compose format */
+ vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
- /* compose/reply/forward formats */
quotefmt_create_new_msg_fmt_widgets(
window,
- vbox,
+ vbox2,
&page->checkbtn_compose_with_format,
- _("Use a specific format for new messages"),
+ 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 */
+ vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+
quotefmt_create_reply_fmt_widgets(
window,
- vbox,
+ vbox2,
&page->checkbtn_reply_with_format,
- _("Use a specific reply quote 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 */
+ vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+
quotefmt_create_forward_fmt_widgets(
window,
- vbox,
+ vbox2,
&page->checkbtn_forward_with_format,
- _("Use a specific forward quote format"),
+ NULL,
&page->forward_quotemark,
&page->forward_body_format,
- FALSE);
- quotefmt_add_info_button(window, vbox);
+ TRUE, NULL);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Forward")));
tmp_ac_prefs = *ac_prefs;
GtkWidget *hbox1;
GtkWidget *label;
GtkWidget *default_privacy_system;
+ GtkListStore *menu;
+ GtkCellRenderer *rend;
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;
gtk_widget_show(label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- default_privacy_system = gtk_option_menu_new();
+ /* Can't use gtkut_sc_combobox_create() here, because model for this
+ * combobox needs an extra string column to store privacy plugin id. */
+ menu = gtk_list_store_new(4,
+ G_TYPE_STRING,
+ G_TYPE_INT,
+ G_TYPE_BOOLEAN,
+ G_TYPE_STRING); /* This is where we store the privacy plugin id. */
+ default_privacy_system = gtk_combo_box_new_with_model(GTK_TREE_MODEL(menu));
+
+ rend = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(default_privacy_system), rend, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(default_privacy_system), rend,
+ "text", COMBOBOX_TEXT,
+ "sensitive", COMBOBOX_SENS,
+ NULL);
+ gtk_combo_box_set_focus_on_click(GTK_COMBO_BOX(default_privacy_system), FALSE);
+
gtk_widget_show (default_privacy_system);
gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, FALSE, TRUE, 0);
+ g_signal_connect(G_OBJECT(default_privacy_system), "changed",
+ G_CALLBACK(privacy_system_activated),
+ NULL);
+
PACK_CHECK_BUTTON (vbox2, default_sign_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 USE_OPENSSL
+#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 *use_nonblocking_ssl_checkbtn;
GtkWidget *hbox;
GtkWidget *hbox_spc;
pop_starttls_radiobtn,
_("Use STARTTLS command to start SSL 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"));
CREATE_RADIO_BUTTONS(vbox3,
imap_starttls_radiobtn,
_("Use STARTTLS command to start SSL 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"));
CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
_("Use SSL for NNTP connection"), 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)"));
smtp_starttls_radiobtn,
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
+ g_signal_connect(G_OBJECT(smtp_ssltunnel_radiobtn), "toggled",
+ G_CALLBACK(smtp_ssltunnel_toggled), NULL);
- vbox6 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox6);
- gtk_box_pack_start (GTK_BOX (vbox1), vbox6, FALSE, FALSE, 0);
+ PACK_FRAME(vbox1, cert_frame, _("Client certificates"));
- PACK_CHECK_BUTTON(vbox6, use_nonblocking_ssl_checkbtn,
+ 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(vbox7, use_nonblocking_ssl_checkbtn,
_("Use non-blocking SSL"));
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);
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->use_nonblocking_ssl_checkbtn = use_nonblocking_ssl_checkbtn;
tmp_ac_prefs = *ac_prefs;
#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 *vbox2;
GtkWidget *hbox1;
GtkWidget *checkbtn_smtpport;
- GtkWidget *entry_smtpport;
+ GtkWidget *spinbtn_smtpport;
GtkWidget *hbox_popport;
GtkWidget *checkbtn_popport;
- GtkWidget *entry_popport;
+ GtkWidget *spinbtn_popport;
GtkWidget *hbox_imapport;
GtkWidget *checkbtn_imapport;
- GtkWidget *entry_imapport;
+ GtkWidget *spinbtn_imapport;
GtkWidget *hbox_nntpport;
GtkWidget *checkbtn_nntpport;
- GtkWidget *entry_nntpport;
+ 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;
+#endif
GtkWidget *folder_frame;
GtkWidget *vbox3;
GtkWidget *table;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_checkbtn;
GtkWidget *trash_folder_entry;
-
+ GtkWidget *imap_use_trash_checkbtn;
+ GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#define PACK_HBOX(hbox) \
{ \
hbox = gtk_hbox_new (FALSE, 8); \
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); \
}
-#define PACK_PORT_ENTRY(box, entry) \
+#define PACK_PORT_SPINBTN(box, spinbtn) \
{ \
- entry = gtk_entry_new (); \
- gtk_entry_set_max_length (GTK_ENTRY(entry), 5); \
- gtk_widget_show (entry); \
- gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); \
- gtk_widget_set_size_request (entry, 64, -1); \
+ spinbtn = gtk_spin_button_new_with_range(0, 65535, 1); \
+ gtk_widget_show (spinbtn); \
+ gtk_box_pack_start (GTK_BOX (box), spinbtn, FALSE, FALSE, 0); \
}
vbox1 = gtk_vbox_new (FALSE, VSPACING);
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_smtpport, _("SMTP port"));
- PACK_PORT_ENTRY (hbox1, entry_smtpport);
- SET_TOGGLE_SENSITIVITY (checkbtn_smtpport, entry_smtpport);
-
+ 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"));
- PACK_PORT_ENTRY (hbox_popport, entry_popport);
- SET_TOGGLE_SENSITIVITY (checkbtn_popport, entry_popport);
+ 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"));
- PACK_PORT_ENTRY (hbox_imapport, entry_imapport);
- SET_TOGGLE_SENSITIVITY (checkbtn_imapport, entry_imapport);
+ 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_ENTRY (hbox_nntpport, entry_nntpport);
- SET_TOGGLE_SENSITIVITY (checkbtn_nntpport, entry_nntpport);
+ 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_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);
+ CLAWS_SET_TIP(entry_domain, tip_domain);
-
+#ifndef G_OS_WIN32
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_tunnelcmd,
_("Use command to communicate with server"));
gtk_widget_show (entry_tunnelcmd);
gtk_box_pack_start (GTK_BOX (hbox1), entry_tunnelcmd, TRUE, TRUE, 0);
SET_TOGGLE_SENSITIVITY (checkbtn_tunnelcmd, entry_tunnelcmd);
-
+#endif
PACK_HBOX (hbox1);
+ PACK_CHECK_BUTTON (hbox1, imap_use_trash_checkbtn,
+ _("Move deleted mails to trash and expunge immediately"));
+ CLAWS_SET_TIP(imap_use_trash_checkbtn,
+ _("Moves deleted mails to trash instead of using the \\Deleted flag without expunging."));
+
+#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
-#undef PACK_PORT_ENTRY
+#undef PACK_PORT_SPINBTN
/* special folder setting (maybe these options are redundant) */
trash_folder_checkbtn, trash_folder_entry, 3);
page->smtpport_checkbtn = checkbtn_smtpport;
- page->smtpport_entry = entry_smtpport;
+ page->smtpport_spinbtn = spinbtn_smtpport;
page->popport_hbox = hbox_popport;
page->popport_checkbtn = checkbtn_popport;
- page->popport_entry = entry_popport;
+ page->popport_spinbtn = spinbtn_popport;
page->imapport_hbox = hbox_imapport;
page->imapport_checkbtn = checkbtn_imapport;
- page->imapport_entry = entry_imapport;
+ page->imapport_spinbtn = spinbtn_imapport;
page->nntpport_hbox = hbox_nntpport;
page->nntpport_checkbtn = checkbtn_nntpport;
- page->nntpport_entry = entry_nntpport;
+ 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->tunnelcmd_entry = entry_tunnelcmd;
-
+#endif
page->sent_folder_checkbtn = sent_folder_checkbtn;
page->sent_folder_entry = sent_folder_entry;
page->queue_folder_checkbtn = queue_folder_checkbtn;
page->draft_folder_entry = draft_folder_entry;
page->trash_folder_checkbtn = trash_folder_checkbtn;
page->trash_folder_entry = trash_folder_entry;
+ page->imap_use_trash_checkbtn = imap_use_trash_checkbtn;
tmp_ac_prefs = *ac_prefs;
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) {
- alertpanel_error(_("The default inbox folder doesn't exist."));
+ alertpanel_error(_("The default Inbox folder doesn't exist."));
return -1;
}
}
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);
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);
return 0;
}
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
static gint prefs_ssl_apply(void)
{
prefs_set_data_from_dialog(ssl_param);
/* PrivacyPage *page = (PrivacyPage *) _page; */
}
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
static void ssl_destroy_widget_func(PrefsPage *_page)
{
/* SSLPage *page = (SSLPage *) _page; */
return prefs_privacy_apply() >= 0;
}
-#if USE_OPENSSL
+#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 USE_OPENSSL
+#ifdef USE_GNUTLS
static void ssl_save_func(PrefsPage *_page)
{
SSLPage *page = (SSLPage *) _page;
prefs_account_register_page((PrefsPage *) &privacy_page);
}
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
static void register_ssl_page(void)
{
static gchar *path[3];
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;
+
+ hookdata->cert_path = NULL;
+ hookdata->password = NULL;
+
+ if (!g_list_find(account_get_list(), account)) {
+ g_warning("can't find sock account\n");
+ 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;
+ if (account->out_ssl_client_cert_pass && *account->out_ssl_client_cert_pass)
+ hookdata->password = account->out_ssl_client_cert_pass;
+ } else {
+ if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
+ hookdata->cert_path = account->in_ssl_client_cert_file;
+ if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass)
+ hookdata->password = account->in_ssl_client_cert_pass;
+ }
+ 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 */
+ pass_data.cond = g_cond_new();
+ pass_data.mutex = g_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);
+ g_cond_free(pass_data.cond);
+ g_mutex_unlock(pass_data.mutex);
+ g_mutex_free(pass_data.mutex);
+
+ return TRUE;
+}
#endif
static void register_advanced_page(void)
register_compose_page();
register_templates_page();
register_privacy_page();
-#if USE_OPENSSL
+#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();
}
gint id;
gchar **strv, **cur;
- 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;
prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
&prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height,
- TRUE, TRUE);
+ TRUE, NULL, NULL);
g_free(title);
gtk_main();
if (cancelled && new_account) {
prefs_account_free(ac_prefs);
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)
{
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_entry,
+ gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn)));
gtk_widget_set_sensitive(send_page.pop_auth_timeout_lbl,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn)));
FolderItem *item;
gchar *id;
- item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
+ item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
if (item && item->path) {
id = folder_item_get_identifier(item);
if (id) {
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));
if (!is_file_exist(sigpath))
str_write_to_file(sigpath, "");
- open_txt_editor(sigpath, prefs_common.ext_editor_cmd);
+ open_txt_editor(sigpath, prefs_common_get_ext_editor_cmd());
}
static void prefs_account_edit_custom_header(void)
gtk_widget_hide(optmenu);
gtk_widget_show(optlabel);
#ifndef HAVE_LIBETPAN
- if (protocol == A_IMAP4) {
+ if (protocol == A_IMAP4 || protocol == A_NNTP) {
gtk_widget_show(protocol_optmenu->no_imap_warn_icon);
gtk_widget_show(protocol_optmenu->no_imap_warn_label);
} else {
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
}
#endif
+ if (protocol == A_IMAP4) {
+ if (new_account)
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
+ TRUE);
+ gtk_widget_hide(send_page.msgid_checkbtn);
+ } else
+ gtk_widget_show(send_page.msgid_checkbtn);
+
+ gtk_widget_show(send_page.xmailer_checkbtn);
}
}
static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
{
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- *((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ *((RecvProtocol *)pparam->data) =
+ combobox_get_active_data(GTK_COMBO_BOX(*pparam->widget));
}
static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
{
IMAPAuthType type = *((IMAPAuthType *)pparam->data);
- GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
- GtkWidget *menu;
- GtkWidget *menuitem;
+ GtkComboBox *optmenu = GTK_COMBO_BOX(*pparam->widget);
- switch (type) {
- case IMAP_AUTH_LOGIN:
- gtk_option_menu_set_history(optmenu, 1);
- break;
- case IMAP_AUTH_CRAM_MD5:
- gtk_option_menu_set_history(optmenu, 2);
- break;
- case IMAP_AUTH_ANON:
- gtk_option_menu_set_history(optmenu, 3);
- break;
- case IMAP_AUTH_GSSAPI:
- gtk_option_menu_set_history(optmenu, 4);
- break;
- case 0:
- default:
- gtk_option_menu_set_history(optmenu, 0);
- }
-
- menu = gtk_option_menu_get_menu(optmenu);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+ combobox_select_by_data(optmenu, type);
}
static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)
{
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- *((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ *((RecvProtocol *)pparam->data) =
+ combobox_get_active_data(GTK_COMBO_BOX(*pparam->widget));
}
static void prefs_account_smtp_auth_type_set_optmenu(PrefParam *pparam)
{
SMTPAuthType type = *((SMTPAuthType *)pparam->data);
- GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- switch (type) {
- case SMTPAUTH_PLAIN:
- gtk_option_menu_set_history(optmenu, 1);
- break;
- case SMTPAUTH_LOGIN:
- gtk_option_menu_set_history(optmenu, 2);
- break;
- case SMTPAUTH_CRAM_MD5:
- gtk_option_menu_set_history(optmenu, 3);
- break;
- case SMTPAUTH_DIGEST_MD5:
- gtk_option_menu_set_history(optmenu, 4);
- break;
- case 0:
- default:
- gtk_option_menu_set_history(optmenu, 0);
- }
+ GtkComboBox *optmenu = GTK_COMBO_BOX(*pparam->widget);
- menu = gtk_option_menu_get_menu(optmenu);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+ combobox_select_by_data(optmenu, type);
}
-static void prefs_account_set_string_from_optmenu(PrefParam *pparam)
+static void prefs_account_set_string_from_combobox(PrefParam *pparam)
{
- GtkWidget *menu;
- GtkWidget *menuitem;
+ GtkWidget *combobox;
+ GtkListStore *menu;
+ GtkTreeIter iter;
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- if (menuitem == NULL)
- return;
+ combobox = *pparam->widget;
+ cm_return_if_fail(gtk_combo_box_get_active_iter(
+ GTK_COMBO_BOX(combobox), &iter));
- str = (gchar **) pparam->data;
- g_free(*str);
- *str = g_strdup(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ str = (gchar **)pparam->data;
+ g_free(*str);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)));
+ gtk_tree_model_get(GTK_TREE_MODEL(menu), &iter,
+ COMBOBOX_PRIVACY_PLUGIN_ID, &(*str),
+ -1);
}
-static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
+/* Context struct and internal function called by gtk_tree_model_foreach().
+ * This is used in prefs_account_set_privacy_combobox_from_string() to find
+ * correct combobox entry to activate when account preferences are displayed
+ * and their values are set according to preferences. */
+typedef struct _privacy_system_set_ctx {
+ GtkWidget *combobox;
+ gchar *prefsid;
+ gboolean found;
+} PrivacySystemSetCtx;
+
+static gboolean _privacy_system_set_func(GtkTreeModel *model, GtkTreePath *path,
+ GtkTreeIter *iter, PrivacySystemSetCtx *ctx)
+{
+ GtkWidget *combobox = ctx->combobox;
+ gchar *prefsid = ctx->prefsid;
+ gchar *curid;
+
+ /* We're searching for correct privacy plugin ID. */
+ gtk_tree_model_get(model, iter, COMBOBOX_PRIVACY_PLUGIN_ID, &curid, -1);
+ if( strcmp(prefsid, curid) == 0 ) {
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combobox), iter);
+ g_free(curid);
+ ctx->found = TRUE;
+ return TRUE;
+ }
+
+ g_free(curid);
+ return FALSE;
+}
+
+static void prefs_account_set_privacy_combobox_from_string(PrefParam *pparam)
{
GtkWidget *optionmenu;
- GtkWidget *menu;
+ GtkListStore *menu;
+ GtkTreeIter iter;
gboolean found = FALSE;
- GList *children, *cur;
gchar *prefsid;
- guint i = 0;
+ PrivacySystemSetCtx *ctx = NULL;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
prefsid = *((gchar **) pparam->data);
if (prefsid == NULL)
return;
optionmenu = *pparam->widget;
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
- children = gtk_container_children(GTK_CONTAINER(menu));
- for (cur = children; cur != NULL; cur = g_list_next(cur)) {
- GtkWidget *item = (GtkWidget *) cur->data;
- gchar *id;
-
- id = g_object_get_data(G_OBJECT(item), MENU_VAL_ID);
- if (id != NULL && strcmp(id, prefsid) == 0) {
- found = TRUE;
- gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
- privacy_system_activated(GTK_MENU_ITEM(item));
- }
- i++;
- }
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optionmenu)));
+ ctx = g_new(PrivacySystemSetCtx, sizeof(PrivacySystemSetCtx));
+ ctx->combobox = optionmenu;
+ ctx->prefsid = prefsid;
+ ctx->found = FALSE;
+
+ gtk_tree_model_foreach(GTK_TREE_MODEL(menu),
+ (GtkTreeModelForeachFunc)_privacy_system_set_func, ctx);
+ found = ctx->found;
+ g_free(ctx);
+
+ /* If chosen privacy system is not available, add a dummy entry with
+ * "not loaded" note and make it active. */
if (!found) {
gchar *name;
- GtkWidget *menuitem;
name = g_strdup_printf(_("%s (plugin not loaded)"), prefsid);
- menuitem = gtk_menu_item_new_with_label(name);
- gtk_widget_show(menuitem);
- g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, prefsid);
- g_object_set_data(G_OBJECT(menuitem), MENU_VAL_DATA, GINT_TO_POINTER(FALSE));
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_list_store_append(menu, &iter);
+ gtk_list_store_set(menu, &iter,
+ COMBOBOX_TEXT, name,
+ COMBOBOX_DATA, 0,
+ COMBOBOX_SENS, TRUE,
+ COMBOBOX_PRIVACY_PLUGIN_ID, prefsid,
+ -1);
g_free(name);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
- privacy_system_activated(GTK_MENU_ITEM(menuitem));
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(privacy_system_activated),
- NULL);
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(optionmenu), &iter);
}
-
- g_list_free(children);
}
static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
switch(protocol) {
case A_NNTP:
+#ifndef HAVE_LIBETPAN
+ gtk_widget_show(protocol_optmenu->no_imap_warn_icon);
+ gtk_widget_show(protocol_optmenu->no_imap_warn_label);
+#else
gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
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),
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn), FALSE);
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, FALSE);
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_entry, FALSE);
+ gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn, FALSE);
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
FALSE);
}
-#if USE_OPENSSL
+#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);
+#endif
+ gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
gtk_widget_hide(receive_page.imapdir_label);
gtk_widget_hide(receive_page.imapdir_entry);
gtk_widget_hide(receive_page.subsonly_checkbtn);
gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
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);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn), FALSE);
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, FALSE);
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_entry, FALSE);
+ gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn, FALSE);
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
TRUE);
}
-#if USE_OPENSSL
+#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);
+#endif
+ gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
gtk_widget_hide(receive_page.imapdir_label);
gtk_widget_hide(receive_page.imapdir_entry);
gtk_widget_hide(receive_page.subsonly_checkbtn);
gtk_widget_show(protocol_optmenu->no_imap_warn_icon);
gtk_widget_show(protocol_optmenu->no_imap_warn_label);
#endif
+ if (new_account)
+ gtk_toggle_button_set_active(
+ 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),
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn), FALSE);
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, FALSE);
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_entry, FALSE);
+ gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn, FALSE);
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
FALSE);
}
-#if USE_OPENSSL
+#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);
+#endif
+ gtk_widget_show(advanced_page.imap_use_trash_checkbtn);
gtk_widget_show(receive_page.imapdir_label);
gtk_widget_show(receive_page.imapdir_entry);
gtk_widget_show(receive_page.subsonly_checkbtn);
gtk_widget_show(receive_page.low_bandwidth_checkbtn);
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 USE_OPENSSL
+#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);
+#endif
+ gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
gtk_widget_hide(receive_page.imapdir_label);
gtk_widget_hide(receive_page.imapdir_entry);
gtk_widget_hide(receive_page.subsonly_checkbtn);
break;
case A_POP3:
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 USE_OPENSSL
+#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);
+#endif
+ gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
gtk_widget_hide(receive_page.imapdir_label);
gtk_widget_hide(receive_page.imapdir_entry);
gtk_widget_hide(receive_page.subsonly_checkbtn);
{
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 *menu;
- GtkWidget *menuitem;
+ GtkWidget *combo;
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- if (menuitem == NULL)
- return;
+ cm_return_if_fail(*pparam->widget != NULL);
+ combo = *pparam->widget;
str = (gchar **) pparam->data;
+
g_free(*str);
- *str = gtkaspell_get_dictionary_menu_active_item(menu);
+ *str = gtkaspell_get_dictionary_menu_active_item(GTK_COMBO_BOX(combo));
}
static void prefs_account_compose_default_dictionary_set_optmenu_from_string
(PrefParam *pparam)
{
- GtkWidget *optionmenu;
- GtkWidget *menu;
- GtkWidget *menuitem;
+ 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);
+ }
- optionmenu = *pparam->widget;
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
- if (dictionary)
- gtkaspell_set_dictionary_menu_active_item(optionmenu, dictionary);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+ if (strchr(dictionary, '-')) {
+ *(strchr(dictionary, '-')) = '\0';
+ }
+ }
+ combo = *pparam->widget;
+ 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
projects / claws.git / blobdiff