/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 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
#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"
static GtkWidget *signature_browse_button;
static GtkWidget *signature_edit_button;
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static GtkWidget *entry_in_cert_file;
static GtkWidget *entry_out_cert_file;
static GtkWidget *in_ssl_cert_browse_button;
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 *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 *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 (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static SSLPage ssl_page;
#endif
static AdvancedPage advanced_page;
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.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},
&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,
{"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},
+
#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},
+
+ {"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);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static void prefs_account_in_cert_browse_cb (GtkWidget *widget,
gpointer data);
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 *hbox_spc;
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;
GtkWidget *frame2;
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
- GtkObject *maxarticle_spinbtn_adj;
+ GtkAdjustment *maxarticle_spinbtn_adj;
CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
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: remove immediately"));
+ _("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);
gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
maxarticle_spinbtn_adj =
- gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
+ 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_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
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);
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;
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_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_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;
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 */
NULL,
&page->compose_subject_format,
&page->compose_body_format,
- FALSE, NULL);
+ TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
/* reply format */
NULL,
&page->reply_quotemark,
&page->reply_body_format,
- FALSE, NULL);
+ TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Reply")));
/* forward format */
NULL,
&page->forward_quotemark,
&page->forward_body_format,
- FALSE, NULL);
+ 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)
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"));
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);
PACK_FRAME(vbox1, cert_frame, _("Client certificates"));
#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;
+ GtkWidget *imap_use_trash_checkbtn;
+
CLAWS_TIP_DECL();
GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#define PACK_HBOX(hbox) \
PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Domain name"));
gtk_size_group_add_widget(size_group, checkbtn_domain);
- CLAWS_SET_TIP(checkbtn_domain,
- _("The domain name will be used in the right part of "
- "the generated Message-Ids, and when connecting to "
- "SMTP servers."));
+ 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,
- _("The domain name will be used in the right part of "
- "the generated Message-Ids, and when connecting to "
- "SMTP servers."));
-
+ CLAWS_SET_TIP(entry_domain, tip_domain);
#ifndef G_OS_WIN32
PACK_HBOX (hbox1);
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
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->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;
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 (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static gint prefs_ssl_apply(void)
{
prefs_set_data_from_dialog(ssl_param);
/* 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;
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];
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);
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,
- NULL, NULL);
+ TRUE, NULL, NULL);
g_free(title);
gtk_main();
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)
{
g_free(utf8_filename);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static void prefs_account_in_cert_browse_cb(GtkWidget *widget, gpointer data)
{
gchar *filename;
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_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);
#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_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);
#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_TOGGLE_BUTTON(send_page.msgid_checkbtn),
TRUE);
gtk_widget_hide(send_page.msgid_checkbtn);
+ if (new_account)
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(send_page.xmailer_checkbtn),
+ TRUE);
+ gtk_widget_hide(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);
#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);
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);
#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);
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 (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);
#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 (!gtkut_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