GtkWidget *nntpport_spinbtn;
GtkWidget *domain_checkbtn;
GtkWidget *domain_entry;
+ GtkWidget *msgid_with_addr_checkbtn;
GtkWidget *crosspost_checkbtn;
GtkWidget *crosspost_colormenu;
{"domain", NULL, &tmp_ac_prefs.domain, P_STRING,
&advanced_page.domain_entry,
prefs_set_data_from_entry, prefs_set_entry},
+
+ {"msgid_with_addr", "FALSE", &tmp_ac_prefs.msgid_with_addr, P_BOOL,
+ &advanced_page.msgid_with_addr_checkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
#ifndef G_OS_WIN32
{"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
&advanced_page.tunnelcmd_checkbtn,
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.default_sign_reply_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 */
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);
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. "));
+ _("Moves deleted mails to trash instead of using the \\Deleted flag without expunging."));
PACK_CHECK_BUTTON (vbox1, filter_on_recv_checkbtn,
_("Filter messages on receiving"));
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);
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);
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) {
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"));
GtkWidget *spinbtn_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
+ gchar *tip_domain;
+ GtkWidget *checkbtn_msgid_with_addr;
GtkWidget *checkbtn_crosspost;
GtkWidget *colormenu_crosspost;
GtkWidget *menu;
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);
+ PACK_HBOX (hbox1);
+ PACK_CHECK_BUTTON (hbox1, checkbtn_msgid_with_addr,
+ _("Send account mail address in Message-ID"));
#ifndef G_OS_WIN32
PACK_HBOX (hbox1);
page->nntpport_spinbtn = spinbtn_nntpport;
page->domain_checkbtn = checkbtn_domain;
page->domain_entry = entry_domain;
+ page->msgid_with_addr_checkbtn = checkbtn_msgid_with_addr;
page->crosspost_checkbtn = checkbtn_crosspost;
page->crosspost_colormenu = colormenu_crosspost;
GtkWidget *menu;
GtkWidget *menuitem;
- gtk_cmoption_menu_set_history(colormenu, colorlabel);
+ 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));
{
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);