/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* 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 "intl.h"
#include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "prefs_account.h"
#include "prefs_customheader.h"
#include "account.h"
GtkWidget *smtpserv_entry;
GtkWidget *nntpserv_entry;
GtkWidget *nntpauth_chkbtn;
+ GtkWidget *nntpauth_onconnect_chkbtn;
GtkWidget *localmbox_entry;
GtkWidget *mailcmd_chkbtn;
GtkWidget *mailcmd_entry;
static struct Send {
GtkWidget *date_chkbtn;
GtkWidget *msgid_chkbtn;
-
GtkWidget *customhdr_chkbtn;
-
GtkWidget *smtp_auth_chkbtn;
GtkWidget *smtp_auth_type_optmenu;
GtkWidget *smtp_uid_entry;
GtkWidget *smtp_pass_entry;
GtkWidget *pop_bfr_smtp_chkbtn;
+ GtkWidget *pop_bfr_smtp_tm_entry;
} p_send;
static struct Compose {
- GtkWidget *sigpath_entry;
-
+ GtkWidget *entry_sigpath;
+ GtkWidget *checkbtn_autosig;
+ GtkWidget *entry_sigsep;
GtkWidget *autocc_chkbtn;
GtkWidget *autocc_entry;
GtkWidget *autobcc_chkbtn;
static struct Privacy {
GtkWidget *default_encrypt_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *ascii_armored_chkbtn;
- GtkWidget *clearsign_chkbtn;
+ GtkWidget *gnupg_mime_radiobtn;
+ GtkWidget *gnupg_inline_radiobtn;
GtkWidget *defaultkey_radiobtn;
GtkWidget *emailkey_radiobtn;
GtkWidget *customkey_radiobtn;
} privacy;
#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
static struct SSLPrefs {
GtkWidget *pop_frame;
GtkWidget *pop_nossl_radiobtn;
GtkWidget *smtp_ssltunnel_radiobtn;
GtkWidget *smtp_starttls_radiobtn;
} ssl;
-#endif /* USE_SSL */
+#endif /* USE_OPENSSL */
static struct Advanced {
GtkWidget *smtpport_chkbtn;
(PrefParam *pparam);
static void prefs_account_smtp_auth_type_set_optmenu (PrefParam *pparam);
-#if USE_GPGME || USE_SSL
+#if USE_GPGME || USE_OPENSSL
static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam);
static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
-#endif /* USE_GPGME || USE_SSL */
+#endif /* USE_GPGME || USE_OPENSSL */
#if USE_GPGME
-static void prefs_account_ascii_armored_warning (GtkWidget *widget);
+static void prefs_account_gnupg_inline_warning (GtkWidget *widget);
#endif /* USE_GPGME */
static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
gpointer user_data);
static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
gpointer user_data);
-static void prefs_account_smtp_userid_cb(GtkEditable *editable,
- gpointer smtp_passwd);
static PrefParam param[] = {
/* Basic */
{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
&basic.nntpauth_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"use_nntp_auth_onconnect", "FALSE", &tmp_ac_prefs.use_nntp_auth_onconnect, P_BOOL,
+ &basic.nntpauth_onconnect_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"user_id", "ENV_USER", &tmp_ac_prefs.userid, P_STRING,
&basic.uid_entry, prefs_set_data_from_entry, prefs_set_entry},
&p_send.pop_bfr_smtp_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"pop_before_smtp_timeout", "5", &tmp_ac_prefs.pop_before_smtp_timeout, P_INT,
+ &p_send.pop_bfr_smtp_tm_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
/* Compose */
{"signature_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
- &compose.sigpath_entry,
+ &compose.entry_sigpath,
+ prefs_set_data_from_entry, prefs_set_entry},
+
+ {"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,
+ &compose.checkbtn_autosig,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"signature_separator", "-- ", &tmp_ac_prefs.sig_sep, P_STRING,
+ &compose.entry_sigsep,
prefs_set_data_from_entry, prefs_set_entry},
{"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL,
{"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
&privacy.default_sign_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL,
- &privacy.ascii_armored_chkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"clearsign", "FALSE", &tmp_ac_prefs.clearsign, P_BOOL,
- &privacy.clearsign_chkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
+ {"default_gnupg_mode", NULL, &tmp_ac_prefs.default_gnupg_mode, P_ENUM,
+ &privacy.gnupg_mime_radiobtn,
+ prefs_account_enum_set_data_from_radiobtn,
+ prefs_account_enum_set_radiobtn},
{"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
&privacy.defaultkey_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_set_data_from_entry, prefs_set_entry},
#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
/* SSL */
{"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
&ssl.pop_nossl_radiobtn,
&ssl.smtp_nossl_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
-#endif /* USE_SSL */
+#endif /* USE_OPENSSL */
/* Advanced */
{"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL,
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
+static gint prefs_account_get_new_id (void);
+
static void prefs_account_create (void);
static void prefs_account_basic_create (void);
static void prefs_account_receive_create (void);
#if USE_GPGME
static void prefs_account_privacy_create (void);
#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
static void prefs_account_ssl_create (void);
-#endif /* USE_SSL */
+#endif /* USE_OPENSSL */
static void prefs_account_advanced_create (void);
static void prefs_account_select_folder_cb (GtkWidget *widget,
gpointer data);
+
+static void pop_bfr_smtp_tm_set_sens (GtkWidget *widget,
+ gpointer data);
+
static void prefs_account_edit_custom_header (void);
static gint prefs_account_deleted (GtkWidget *widget,
static gint prefs_account_apply (void);
static void prefs_account_cancel (void);
+PrefsAccount *prefs_account_new(void)
+{
+ PrefsAccount *ac_prefs;
+
+ ac_prefs = g_new0(PrefsAccount, 1);
+ memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
+ prefs_set_default(param);
+ *ac_prefs = tmp_ac_prefs;
+ ac_prefs->account_id = prefs_account_get_new_id();
+
+ return ac_prefs;
+}
+
void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
{
const gchar *p = label;
prefs_custom_header_read_config(ac_prefs);
}
-void prefs_account_save_config(PrefsAccount *ac_prefs)
-{
- gchar *buf;
-
- g_return_if_fail(ac_prefs != NULL);
-
- tmp_ac_prefs = *ac_prefs;
- buf = g_strdup_printf("Account: %d", ac_prefs->account_id);
- prefs_save_config(param, buf, ACCOUNT_RC);
-}
-
void prefs_account_save_config_all(GList *account_list)
{
GList *cur;
if (fprintf(pfile->fp, "[Account: %d]\n",
tmp_ac_prefs.account_id) <= 0 ||
prefs_write_param(param, pfile->fp) < 0) {
- g_warning(_("failed to write configuration to file\n"));
- prefs_write_close_revert(pfile);
+ g_warning("failed to write configuration to file\n");
+ prefs_file_close_revert(pfile);
return;
}
if (cur->next) {
if (fputc('\n', pfile->fp) == EOF) {
FILE_OP_ERROR(rcpath, "fputc");
- prefs_write_close_revert(pfile);
+ prefs_file_close_revert(pfile);
return;
}
}
}
- if (prefs_write_close(pfile) < 0)
- g_warning(_("failed to write configuration to file\n"));
+ if (prefs_file_close(pfile) < 0)
+ g_warning("failed to write configuration to file\n");
}
void prefs_account_free(PrefsAccount *ac_prefs)
cancelled = FALSE;
if (!ac_prefs) {
- ac_prefs = g_new0(PrefsAccount, 1);
- memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
- prefs_set_default(param);
- *ac_prefs = tmp_ac_prefs;
- ac_prefs->account_id = prefs_account_get_new_id();
+ ac_prefs = prefs_account_new();
new_account = TRUE;
}
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
}
+ pop_bfr_smtp_tm_set_sens (NULL, NULL);
+
gtk_widget_show(dialog.window);
gtk_main();
gtk_widget_hide(dialog.window);
prefs_account_privacy_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
prefs_account_ssl_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("SSL"), page++);
-#endif /* USE_SSL */
+#endif /* USE_OPENSSL */
prefs_account_advanced_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Advanced"), page++);
GtkWidget *smtpserv_entry;
GtkWidget *nntpserv_entry;
GtkWidget *nntpauth_chkbtn;
+ GtkWidget *nntpauth_onconnect_chkbtn;
GtkWidget *localmbox_entry;
GtkWidget *mailcmd_chkbtn;
GtkWidget *mailcmd_entry;
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Name of this account"));
+ label = gtk_label_new (_("Name of account"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
nntpauth_chkbtn = gtk_check_button_new_with_label
(_("This server requires authentication"));
gtk_widget_show (nntpauth_chkbtn);
- gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 4, 1, 2,
+
+ gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 1, 2,
+ GTK_FILL, 0, 0, 0);
+
+ nntpauth_onconnect_chkbtn = gtk_check_button_new_with_label
+ (_("Authenticate on connect"));
+ gtk_widget_show (nntpauth_onconnect_chkbtn);
+
+ gtk_table_attach (GTK_TABLE (serv_table), nntpauth_onconnect_chkbtn, 2, 4, 1, 2,
GTK_FILL, 0, 0, 0);
recvserv_entry = gtk_entry_new ();
SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, pass_label);
SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, uid_entry);
SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, pass_entry);
+ SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, nntpauth_onconnect_chkbtn);
basic.acname_entry = acname_entry;
basic.default_chkbtn = default_chkbtn;
basic.nntpserv_label = nntpserv_label;
basic.nntpserv_entry = nntpserv_entry;
basic.nntpauth_chkbtn = nntpauth_chkbtn;
+ basic.nntpauth_onconnect_chkbtn = nntpauth_onconnect_chkbtn;
basic.localmbox_label = localmbox_label;
basic.localmbox_entry = localmbox_entry;
basic.mailcmd_chkbtn = mailcmd_chkbtn;
gtk_widget_set_usize (size_limit_entry, 64, -1);
gtk_box_pack_start (GTK_BOX (hbox1), size_limit_entry, FALSE, FALSE, 0);
- label = gtk_label_new ("KB");
+ label = gtk_label_new (_("KB"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
GtkWidget *smtp_pass_entry;
GtkWidget *vbox_spc;
GtkWidget *pop_bfr_smtp_chkbtn;
+ GtkWidget *pop_bfr_smtp_tm_entry;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
- PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date header field"));
+ PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date"));
PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
hbox = gtk_hbox_new (FALSE, 12);
PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
_("Authenticate with POP3 before sending"));
+
+ gtk_signal_connect (GTK_OBJECT (pop_bfr_smtp_chkbtn), "clicked",
+ GTK_SIGNAL_FUNC (pop_bfr_smtp_tm_set_sens),
+ NULL);
+
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox3), hbox, FALSE, FALSE, 0);
+
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox_spc);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ gtk_widget_set_usize (hbox_spc, 12, -1);
+
+ label = gtk_label_new(_("POP authentication timeout: "));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ pop_bfr_smtp_tm_entry = gtk_entry_new ();
+ gtk_widget_show (pop_bfr_smtp_tm_entry);
+ gtk_widget_set_usize (pop_bfr_smtp_tm_entry, 30, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), pop_bfr_smtp_tm_entry, FALSE, FALSE, 0);
+
+ label = gtk_label_new(_("minutes"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+
+
p_send.date_chkbtn = date_chkbtn;
p_send.msgid_chkbtn = msgid_chkbtn;
p_send.customhdr_chkbtn = customhdr_chkbtn;
p_send.smtp_uid_entry = smtp_uid_entry;
p_send.smtp_pass_entry = smtp_pass_entry;
p_send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
+ p_send.pop_bfr_smtp_tm_entry = pop_bfr_smtp_tm_entry;
}
static void prefs_account_compose_create(void)
{
GtkWidget *vbox1;
- GtkWidget *hbox;
- GtkWidget *label;
- GtkWidget *sigpath_entry;
+ GtkWidget *hbox1;
+ GtkWidget *hbox2;
+ GtkWidget *frame_sig;
+ GtkWidget *vbox_sig;
+ GtkWidget *label_sigpath;
+ GtkWidget *entry_sigpath;
+ GtkWidget *checkbtn_autosig;
+ GtkWidget *label_sigsep;
+ GtkWidget *entry_sigsep;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *autocc_chkbtn;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, FALSE, 0);
+ PACK_FRAME(vbox1, frame_sig, _("Signature"));
- label = gtk_label_new (_("Signature file"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox_sig);
+ gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
+
+ PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
+ _("Insert signature automatically"));
- sigpath_entry = gtk_entry_new ();
- gtk_widget_show (sigpath_entry);
- gtk_box_pack_start (GTK_BOX (hbox), sigpath_entry, TRUE, TRUE, 0);
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
+ label_sigsep = gtk_label_new (_("Signature separator"));
+ gtk_widget_show (label_sigsep);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
+
+ entry_sigsep = gtk_entry_new ();
+ gtk_widget_show (entry_sigsep);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
+
+ gtk_widget_set_usize (entry_sigsep, 64, -1);
+
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_box_pack_start (GTK_BOX (vbox_sig), hbox2, TRUE, TRUE, 0);
+ label_sigpath = gtk_label_new (_("Signature file"));
+ gtk_widget_show (label_sigpath);
+ gtk_box_pack_start (GTK_BOX (hbox2), label_sigpath, FALSE, FALSE, 0);
+
+ entry_sigpath = gtk_entry_new ();
+ gtk_widget_show (entry_sigpath);
+ gtk_box_pack_start (GTK_BOX (hbox2), entry_sigpath, TRUE, TRUE, 0);
PACK_FRAME (vbox1, frame, _("Automatically set the following addresses"));
SET_TOGGLE_SENSITIVITY (autoreplyto_chkbtn, autoreplyto_entry);
- compose.sigpath_entry = sigpath_entry;
+ compose.entry_sigpath = entry_sigpath;
+ compose.checkbtn_autosig = checkbtn_autosig;
+ compose.entry_sigsep = entry_sigsep;
compose.autocc_chkbtn = autocc_chkbtn;
compose.autocc_entry = autocc_entry;
static void prefs_account_privacy_create(void)
{
GtkWidget *vbox1;
+ GtkWidget *frame_mode;
+ GtkWidget *vbox_mode;
GtkWidget *frame1;
GtkWidget *vbox2;
GtkWidget *hbox1;
GtkWidget *label;
GtkWidget *default_encrypt_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *ascii_armored_chkbtn;
- GtkWidget *clearsign_chkbtn;
+ GtkWidget *gnupg_mime_radiobtn;
+ GtkWidget *gnupg_inline_radiobtn;
GtkWidget *defaultkey_radiobtn;
GtkWidget *emailkey_radiobtn;
GtkWidget *customkey_radiobtn;
_("Encrypt message by default"));
PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
_("Sign message by default"));
- PACK_CHECK_BUTTON (vbox2, ascii_armored_chkbtn,
- _("Use ASCII-armored format for encryption"));
- PACK_CHECK_BUTTON (vbox2, clearsign_chkbtn,
- _("Use clear text signature"));
- gtk_signal_connect (GTK_OBJECT (ascii_armored_chkbtn), "toggled",
- prefs_account_ascii_armored_warning, NULL);
+
+ PACK_FRAME (vbox1, frame_mode, _("Default mode"));
+
+ vbox_mode = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox_mode);
+ gtk_container_add (GTK_CONTAINER (frame_mode), vbox_mode);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_mode), 8);
+
+ gnupg_mime_radiobtn = gtk_radio_button_new_with_label
+ (NULL, _("Use PGP/MIME"));
+ gtk_widget_show (gnupg_mime_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_mime_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (gnupg_mime_radiobtn),
+ GINT_TO_POINTER (GNUPG_MODE_DETACH));
+
+ gnupg_inline_radiobtn = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON (gnupg_mime_radiobtn),
+ _("Use Inline"));
+ gtk_widget_show (gnupg_inline_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_inline_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (gnupg_inline_radiobtn),
+ GINT_TO_POINTER (GNUPG_MODE_INLINE));
+ gtk_signal_connect (GTK_OBJECT (gnupg_inline_radiobtn), "clicked",
+ prefs_account_gnupg_inline_warning, NULL);
+
PACK_FRAME (vbox1, frame1, _("Sign key"));
privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
privacy.default_sign_chkbtn = default_sign_chkbtn;
- privacy.ascii_armored_chkbtn = ascii_armored_chkbtn;
- privacy.clearsign_chkbtn = clearsign_chkbtn;
+ privacy.gnupg_mime_radiobtn = gnupg_mime_radiobtn;
+ privacy.gnupg_inline_radiobtn = gnupg_inline_radiobtn;
privacy.defaultkey_radiobtn = defaultkey_radiobtn;
privacy.emailkey_radiobtn = emailkey_radiobtn;
privacy.customkey_radiobtn = customkey_radiobtn;
}
#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data) \
{ \
#undef CREATE_RADIO_BUTTONS
#undef CREATE_RADIO_BUTTON
-#endif /* USE_SSL */
+#endif /* USE_OPENSSL */
static void crosspost_color_toggled(void)
{
gtk_main_quit();
}
+static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
+{
+ gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry,
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn)));
+}
+
static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
{
FolderItem *item;
prefs_custom_header_open(&tmp_ac_prefs);
}
-#if USE_GPGME || USE_SSL
+#if USE_GPGME || USE_OPENSSL
static void prefs_account_enum_set_data_from_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
}
}
-#endif /* USE_GPGME || USE_SSL */
+#endif /* USE_GPGME || USE_OPENSSL */
#if USE_GPGME
-static void prefs_account_ascii_armored_warning(GtkWidget *widget)
+static void prefs_account_gnupg_inline_warning(GtkWidget *widget)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) &&
gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook)) > 0)
alertpanel_warning
- (_("It's not recommended to use the old style ASCII-armored\n"
- "mode for encrypted messages. It doesn't comply with the\n"
+ (_("Its not recommended to use the old style Inline\n"
+ "mode for GnuPG messages. It doesn't comply with\n"
"RFC 3156 - MIME Security with OpenPGP."));
}
#endif /* USE_GPGME */
gtk_widget_show(basic.nntpserv_entry);
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
0, VSPACING_NARROW);
+
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, TRUE);
gtk_widget_show(basic.nntpauth_chkbtn);
+
+ gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, TRUE);
+ gtk_widget_show(basic.nntpauth_onconnect_chkbtn);
+
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
1, VSPACING_NARROW);
gtk_widget_hide(basic.recvserv_label);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
/* update userid/passwd sensitive state */
+
prefs_account_nntpauth_toggled
(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
/* update pop_before_smtp sensitivity */
- gtk_toggle_button_set_active(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn), FALSE);
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
FALSE);
}
-#if USE_SSL
+#if USE_OPENSSL
gtk_widget_hide(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_show(ssl.nntp_frame);
0, 0);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+
+ gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_onconnect_chkbtn);
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
1, 0);
gtk_widget_hide(basic.recvserv_label);
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
/* update pop_before_smtp sensitivity */
- gtk_toggle_button_set_active(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn), FALSE);
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
TRUE);
}
-#if USE_SSL
+#if USE_OPENSSL
gtk_widget_hide(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_hide(ssl.nntp_frame);
0, 0);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+
+ gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_onconnect_chkbtn);
+
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
1, 0);
gtk_widget_set_sensitive(basic.recvserv_label, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
/* update pop_before_smtp sensitivity */
- gtk_toggle_button_set_active(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn), FALSE);
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
-
+ gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
+
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
FALSE);
}
-#if USE_SSL
+#if USE_OPENSSL
gtk_widget_hide(ssl.pop_frame);
gtk_widget_show(ssl.imap_frame);
gtk_widget_hide(ssl.nntp_frame);
0, 0);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+
+ gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_onconnect_chkbtn);
+
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
1, 0);
gtk_widget_set_sensitive(basic.recvserv_label, TRUE);
/* update pop_before_smtp sensitivity */
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, TRUE);
+ pop_bfr_smtp_tm_set_sens(NULL, NULL);
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
TRUE);
}
-#if USE_SSL
+#if USE_OPENSSL
gtk_widget_show(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_hide(ssl.nntp_frame);
gtk_widget_set_sensitive(basic.pass_label, auth);
gtk_widget_set_sensitive(basic.uid_entry, auth);
gtk_widget_set_sensitive(basic.pass_entry, auth);
+ gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, auth);
}
static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
projects / claws.git / blobdiff