/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 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"
#include "mainwindow.h"
#include "manage_window.h"
+#include "foldersel.h"
#include "inc.h"
#include "menu.h"
#include "gtkutils.h"
#include "utils.h"
#include "alertpanel.h"
+#include "colorlabel.h"
+#include "smtp.h"
+#include "imap.h"
+#include "remotefolder.h"
static gboolean cancelled;
GtkWidget *serv_frame;
GtkWidget *serv_table;
GtkWidget *protocol_optmenu;
- GtkWidget *inbox_label;
- GtkWidget *inbox_entry;
GtkWidget *recvserv_label;
GtkWidget *smtpserv_label;
GtkWidget *nntpserv_label;
GtkWidget *smtpserv_entry;
GtkWidget *nntpserv_entry;
GtkWidget *nntpauth_chkbtn;
+ GtkWidget *nntpauth_onconnect_chkbtn;
GtkWidget *localmbox_entry;
GtkWidget *mailcmd_chkbtn;
GtkWidget *mailcmd_entry;
static struct Receive {
GtkWidget *pop3_frame;
+ GtkWidget *use_apop_chkbtn;
GtkWidget *rmmail_chkbtn;
+ GtkWidget *leave_time_entry;
GtkWidget *getall_chkbtn;
- GtkWidget *recvatgetall_chkbtn;
- GtkWidget *filter_on_recv_chkbtn;
+ GtkWidget *size_limit_chkbtn;
+ GtkWidget *size_limit_entry;
+ GtkWidget *inbox_label;
+ GtkWidget *inbox_entry;
+ GtkWidget *inbox_btn;
+ GtkWidget *filter_on_recv_chkbtn;
+ GtkWidget *recvatgetall_chkbtn;
+
GtkWidget *imap_frame;
- GtkWidget *imapdir_entry;
+ GtkWidget *imap_auth_type_optmenu;
+
+ GtkWidget *frame_maxarticle;
+ GtkWidget *label_maxarticle;
+ GtkWidget *spinbtn_maxarticle;
+ GtkObject *spinbtn_maxarticle_adj;
} receive;
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 *sigfile_radiobtn;
+ GtkWidget *entry_sigpath;
+ GtkWidget *checkbtn_autosig;
+ GtkWidget *entry_sigsep;
GtkWidget *autocc_chkbtn;
GtkWidget *autocc_entry;
GtkWidget *autobcc_chkbtn;
GtkWidget *autobcc_entry;
GtkWidget *autoreplyto_chkbtn;
GtkWidget *autoreplyto_entry;
-
- GtkWidget *smtp_auth_chkbtn;
- GtkWidget *pop_bfr_smtp_chkbtn;
-} send;
-
-static struct Compose {
- GtkWidget *sigpath_entry;
} compose;
-#if USE_GPGME
static struct Privacy {
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
+ GtkWidget *default_privacy_system;
+ GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_sign_chkbtn;
+ GtkWidget *save_clear_text_chkbtn;
} privacy;
-#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
static struct SSLPrefs {
- GtkWidget *receive_frame;
- GtkWidget *pop_chkbtn;
- GtkWidget *imap_chkbtn;
+ GtkWidget *pop_frame;
+ GtkWidget *pop_nossl_radiobtn;
+ GtkWidget *pop_ssltunnel_radiobtn;
+ GtkWidget *pop_starttls_radiobtn;
+
+ GtkWidget *imap_frame;
+ GtkWidget *imap_nossl_radiobtn;
+ GtkWidget *imap_ssltunnel_radiobtn;
+ GtkWidget *imap_starttls_radiobtn;
+
+ GtkWidget *nntp_frame;
+ GtkWidget *nntp_nossl_radiobtn;
+ GtkWidget *nntp_ssltunnel_radiobtn;
GtkWidget *send_frame;
GtkWidget *smtp_nossl_radiobtn;
GtkWidget *smtp_ssltunnel_radiobtn;
- GtkWidget *smtp_sslstarttls_radiobtn;
+ GtkWidget *smtp_starttls_radiobtn;
+
+ GtkWidget *use_nonblocking_ssl_chkbtn;
} ssl;
-#endif /* USE_SSL */
+#endif /* USE_OPENSSL */
static struct Advanced {
GtkWidget *smtpport_chkbtn;
GtkWidget *nntpport_entry;
GtkWidget *domain_chkbtn;
GtkWidget *domain_entry;
+ GtkWidget *crosspost_chkbtn;
+ GtkWidget *crosspost_colormenu;
+
+ GtkWidget *tunnelcmd_chkbtn;
+ GtkWidget *tunnelcmd_entry;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_entry;
+
+ GtkWidget *sent_folder_chkbtn;
+ GtkWidget *sent_folder_entry;
+ GtkWidget *draft_folder_chkbtn;
+ GtkWidget *draft_folder_entry;
+ GtkWidget *trash_folder_chkbtn;
+ GtkWidget *trash_folder_entry;
} advanced;
static void prefs_account_fix_size (void);
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam);
static void prefs_account_protocol_set_optmenu (PrefParam *pparam);
static void prefs_account_protocol_activated (GtkMenuItem *menuitem);
-#if USE_GPGME || USE_SSL
+
+static void prefs_account_set_string_from_optmenu (PrefParam *pparam);
+static void prefs_account_set_optmenu_from_string (PrefParam *pparam);
+
+static void prefs_account_imap_auth_type_set_data_from_optmenu
+ (PrefParam *pparam);
+static void prefs_account_imap_auth_type_set_optmenu (PrefParam *pparam);
+static void prefs_account_smtp_auth_type_set_data_from_optmenu
+ (PrefParam *pparam);
+static void prefs_account_smtp_auth_type_set_optmenu (PrefParam *pparam);
+
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 */
+
+static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
+static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
gpointer user_data);
{"nntp_server", NULL, &tmp_ac_prefs.nntp_server, P_STRING,
&basic.nntpserv_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"local_mbox", NULL, &tmp_ac_prefs.local_mbox, P_STRING,
+ {"local_mbox", "/var/mail", &tmp_ac_prefs.local_mbox, P_STRING,
&basic.localmbox_entry, prefs_set_data_from_entry, prefs_set_entry},
{"use_mail_command", "FALSE", &tmp_ac_prefs.use_mail_command, P_BOOL,
&basic.mailcmd_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
- {"mail_command", "/usr/sbin/sendmail", &tmp_ac_prefs.mail_command, P_STRING,
+ {"mail_command", DEFAULT_SENDMAIL_CMD, &tmp_ac_prefs.mail_command, P_STRING,
&basic.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
{"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},
- {"password", NULL, &tmp_ac_prefs.passwd, P_STRING,
+ {"password", NULL, &tmp_ac_prefs.passwd, P_PASSWORD,
&basic.pass_entry, prefs_set_data_from_entry, prefs_set_entry},
{"inbox", "inbox", &tmp_ac_prefs.inbox, P_STRING,
- &basic.inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
+ &receive.inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
/* Receive */
+ {"use_apop_auth", "FALSE", &tmp_ac_prefs.use_apop_auth, P_BOOL,
+ &receive.use_apop_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"remove_mail", "TRUE", &tmp_ac_prefs.rmmail, P_BOOL,
&receive.rmmail_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"message_leave_time", "0", &tmp_ac_prefs.msg_leave_time, P_INT,
+ &receive.leave_time_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
{"get_all_mail", "FALSE", &tmp_ac_prefs.getall, P_BOOL,
&receive.getall_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
- &receive.recvatgetall_chkbtn,
+ {"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
+ &receive.size_limit_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT,
+ &receive.size_limit_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
{"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
&receive.filter_on_recv_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
- &receive.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"imap_auth_method", "0", &tmp_ac_prefs.imap_auth_type, P_ENUM,
+ &receive.imap_auth_type_optmenu,
+ prefs_account_imap_auth_type_set_data_from_optmenu,
+ prefs_account_imap_auth_type_set_optmenu},
+
+ {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
+ &receive.recvatgetall_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"max_news_articles", "300", &tmp_ac_prefs.max_articles, P_INT,
+ &receive.spinbtn_maxarticle,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
/* Send */
{"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
- &send.date_chkbtn,
+ &p_send.date_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
- &send.msgid_chkbtn,
+ &p_send.msgid_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
- &send.customhdr_chkbtn,
+ &p_send.customhdr_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
+ &p_send.smtp_auth_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"smtp_auth_method", "0", &tmp_ac_prefs.smtp_auth_type, P_ENUM,
+ &p_send.smtp_auth_type_optmenu,
+ prefs_account_smtp_auth_type_set_data_from_optmenu,
+ prefs_account_smtp_auth_type_set_optmenu},
+
+ {"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
+ &p_send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_PASSWORD,
+ &p_send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
+ &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_type", "0", &tmp_ac_prefs.sig_type, P_ENUM,
+ &compose.sigfile_radiobtn,
+ prefs_account_enum_set_data_from_radiobtn,
+ prefs_account_enum_set_radiobtn},
+ {"signature_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
+ &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,
- &send.autocc_chkbtn,
+ &compose.autocc_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING,
- &send.autocc_entry,
+ &compose.autocc_entry,
prefs_set_data_from_entry, prefs_set_entry},
{"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL,
- &send.autobcc_chkbtn,
+ &compose.autobcc_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"auto_bcc", NULL, &tmp_ac_prefs.auto_bcc, P_STRING,
- &send.autobcc_entry,
+ &compose.autobcc_entry,
prefs_set_data_from_entry, prefs_set_entry},
{"set_autoreplyto", "FALSE", &tmp_ac_prefs.set_autoreplyto, P_BOOL,
- &send.autoreplyto_chkbtn,
+ &compose.autoreplyto_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING,
- &send.autoreplyto_entry,
+ &compose.autoreplyto_entry,
prefs_set_data_from_entry, prefs_set_entry},
- {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
- &send.smtp_auth_chkbtn,
+ /* Privacy */
+ {"default_privacy_system", "", &tmp_ac_prefs.default_privacy_system, P_STRING,
+ &privacy.default_privacy_system,
+ prefs_account_set_string_from_optmenu, prefs_account_set_optmenu_from_string},
+ {"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
+ &privacy.default_encrypt_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
-
- {"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
- &send.pop_bfr_smtp_chkbtn,
+ {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
+ &privacy.default_sign_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"save_clear_text", "FALSE", &tmp_ac_prefs.save_encrypted_as_clear_text, P_BOOL,
+ &privacy.save_clear_text_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- /* Compose */
- {"signature_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
- &compose.sigpath_entry,
- prefs_set_data_from_entry, prefs_set_entry},
-
-#if USE_GPGME
- /* Privacy */
- {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
- &privacy.defaultkey_radiobtn,
+#if USE_OPENSSL
+ /* SSL */
+ {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
+ &ssl.pop_nossl_radiobtn,
+ prefs_account_enum_set_data_from_radiobtn,
+ prefs_account_enum_set_radiobtn},
+ {"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
+ &ssl.imap_nossl_radiobtn,
+ prefs_account_enum_set_data_from_radiobtn,
+ prefs_account_enum_set_radiobtn},
+ {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
+ &ssl.nntp_nossl_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
- {"sign_key_id", NULL, &tmp_ac_prefs.sign_key_id, P_STRING,
- &privacy.customkey_entry,
- prefs_set_data_from_entry, prefs_set_entry},
-#endif /* USE_GPGME */
-
-#if USE_SSL
- /* SSL */
{"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
&ssl.smtp_nossl_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
- {"ssl_pop", "FALSE", &tmp_ac_prefs.ssl_pop, P_BOOL,
- &ssl.pop_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
- {"ssl_imap", "FALSE", &tmp_ac_prefs.ssl_imap, P_BOOL,
- &ssl.imap_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
-#endif /* USE_SSL */
+
+ {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
+ &ssl.use_nonblocking_ssl_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+#endif /* USE_OPENSSL */
/* Advanced */
{"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL,
&advanced.domain_entry,
prefs_set_data_from_entry, prefs_set_entry},
+ {"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
+ &advanced.tunnelcmd_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"tunnelcmd", NULL, &tmp_ac_prefs.tunnelcmd, P_STRING,
+ &advanced.tunnelcmd_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
+ {"mark_crosspost_read", "FALSE", &tmp_ac_prefs.mark_crosspost_read, P_BOOL,
+ &advanced.crosspost_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"crosspost_color", NULL, &tmp_ac_prefs.crosspost_col, P_ENUM,
+ &advanced.crosspost_colormenu,
+ prefs_account_crosspost_set_data_from_colormenu,
+ prefs_account_crosspost_set_colormenu},
+
+ {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
+ &advanced.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
+ &advanced.sent_folder_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"sent_folder", NULL, &tmp_ac_prefs.sent_folder, P_STRING,
+ &advanced.sent_folder_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
+ {"set_draft_folder", "FALSE", &tmp_ac_prefs.set_draft_folder, P_BOOL,
+ &advanced.draft_folder_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"draft_folder", NULL, &tmp_ac_prefs.draft_folder, P_STRING,
+ &advanced.draft_folder_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
+ {"set_trash_folder", "FALSE", &tmp_ac_prefs.set_trash_folder, P_BOOL,
+ &advanced.trash_folder_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
+ &advanced.trash_folder_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
{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);
static void prefs_account_send_create (void);
static void prefs_account_compose_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,
GdkEventAny *event,
gpointer data);
-static void prefs_account_key_pressed (GtkWidget *widget,
+static gboolean prefs_account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_account_ok (void);
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;
+ const guchar *p = label;
gint id;
g_return_if_fail(ac_prefs != NULL);
if (id < 0) g_warning("wrong account id: %d\n", id);
ac_prefs->account_id = id;
- prefs_custom_header_read_config(ac_prefs);
-}
-
-void prefs_account_save_config(PrefsAccount *ac_prefs)
-{
- gchar *buf;
-
- g_return_if_fail(ac_prefs != NULL);
+ if (ac_prefs->protocol == A_APOP) {
+ debug_print("converting protocol A_APOP to new prefs.\n");
+ ac_prefs->protocol = A_POP3;
+ ac_prefs->use_apop_auth = TRUE;
+ }
- tmp_ac_prefs = *ac_prefs;
- buf = g_strdup_printf("Account: %d", ac_prefs->account_id);
- prefs_save_config(param, buf, ACCOUNT_RC);
+ prefs_custom_header_read_config(ac_prefs);
}
-void prefs_account_save_config_all(GList *account_list)
+void prefs_account_write_config_all(GList *account_list)
{
GList *cur;
gchar *rcpath;
PrefFile *pfile;
- if (!account_list) return;
-
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
if ((pfile = prefs_write_open(rcpath)) == NULL) {
g_free(rcpath);
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)
return last_id + 1;
}
+void update_privacy_system_menu() {
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GSList *system_ids, *cur;
+
+ menu = gtk_menu_new();
+
+ menuitem = gtk_menu_item_new_with_label(_("None"));
+ gtk_widget_show(menuitem);
+ g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+
+ 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);
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+ }
+
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(privacy.default_privacy_system), menu);
+}
+
PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
{
gboolean new_account = FALSE;
if (prefs_rc_is_readonly(ACCOUNT_RC))
return ac_prefs;
- debug_print(_("Opening account preferences window...\n"));
+ debug_print("Opening account preferences window...\n");
inc_lock();
cancelled = FALSE;
if (!ac_prefs) {
- ac_prefs = g_new0(PrefsAccount, 1);
- ac_prefs->account_id = prefs_account_get_new_id();
+ ac_prefs = prefs_account_new();
new_account = TRUE;
}
}
manage_window_set_transient(GTK_WINDOW(dialog.window));
- gtk_notebook_set_page(GTK_NOTEBOOK(dialog.notebook), 0);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
gtk_widget_grab_focus(dialog.ok_btn);
tmp_ac_prefs = *ac_prefs;
+ update_privacy_system_menu();
+
if (new_account) {
PrefsAccount *def_ac;
gchar *buf;
gtk_entry_set_text(GTK_ENTRY(basic.org_entry),
def_ac->organization ? def_ac->organization : "");
}
+ menu_set_sensitive_all
+ (GTK_MENU_SHELL
+ (gtk_option_menu_get_menu
+ (GTK_OPTION_MENU
+ (basic.protocol_optmenu))),
+ TRUE);
gtk_window_set_title(GTK_WINDOW(dialog.window),
_("Preferences for new account"));
gtk_widget_hide(dialog.apply_btn);
} else {
+ gchar *title;
prefs_set_dialog(param);
- gtk_window_set_title(GTK_WINDOW(dialog.window),
- _("Account preferences"));
+ title = g_strdup_printf (_("%s - Account preferences"),
+ ac_prefs->account_name);
+ gtk_window_set_title(GTK_WINDOW(dialog.window), title);
+ g_free (title);
gtk_widget_show(dialog.apply_btn);
}
- if (ac_prefs->protocol != A_LOCAL) {
- gtk_widget_set_sensitive(basic.smtpserv_entry, 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);
{
gint page = 0;
- debug_print(_("Creating account preferences window...\n"));
+ debug_print("Creating account preferences window...\n");
/* create dialog */
prefs_dialog_create(&dialog);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
- GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_out_event",
- GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.ok_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_ok), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.apply_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_apply), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_cancel), NULL);
+ g_signal_connect(G_OBJECT(dialog.window), "delete_event",
+ G_CALLBACK(prefs_account_deleted), NULL);
+ g_signal_connect(G_OBJECT(dialog.window), "key_press_event",
+ G_CALLBACK(prefs_account_key_pressed), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
+
+ g_signal_connect(G_OBJECT(dialog.ok_btn), "clicked",
+ G_CALLBACK(prefs_account_ok), NULL);
+ g_signal_connect(G_OBJECT(dialog.apply_btn), "clicked",
+ G_CALLBACK(prefs_account_apply), NULL);
+ g_signal_connect(G_OBJECT(dialog.cancel_btn), "clicked",
+ G_CALLBACK(prefs_account_cancel), NULL);
prefs_account_basic_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Basic"), page++);
SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
prefs_account_compose_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
-#if USE_GPGME
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++);
prefs_account_fix_size();
- gtk_widget_show(dialog.window);
}
/**
#define SET_ACTIVATE(menuitem) \
{ \
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate", \
- GTK_SIGNAL_FUNC(prefs_account_protocol_activated), \
- NULL); \
+ g_signal_connect(G_OBJECT(menuitem), "activate", \
+ G_CALLBACK(prefs_account_protocol_activated), \
+ NULL); \
}
#define TABLE_YPAD 2
GtkWidget *optmenu;
GtkWidget *optmenu_menu;
GtkWidget *menuitem;
- GtkWidget *inbox_label;
- GtkWidget *inbox_entry;
GtkWidget *serv_table;
GtkWidget *recvserv_label;
GtkWidget *smtpserv_label;
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);
acname_entry = gtk_entry_new ();
gtk_widget_show (acname_entry);
- gtk_widget_set_usize (acname_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (acname_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox), acname_entry, TRUE, TRUE, 0);
- default_chkbtn = gtk_check_button_new_with_label (_("Usually used"));
+ default_chkbtn = gtk_check_button_new_with_label (_("Set as default"));
gtk_widget_show (default_chkbtn);
gtk_box_pack_end (GTK_BOX (hbox), default_chkbtn, FALSE, FALSE, 0);
optmenu_menu = gtk_menu_new ();
- MENUITEM_ADD (optmenu_menu, menuitem, _("POP3 (normal)"), A_POP3);
- SET_ACTIVATE (menuitem);
- MENUITEM_ADD (optmenu_menu, menuitem, _("POP3 (APOP auth)"), A_APOP);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("POP3"), A_POP3);
SET_ACTIVATE (menuitem);
MENUITEM_ADD (optmenu_menu, menuitem, _("IMAP4"), A_IMAP4);
SET_ACTIVATE (menuitem);
MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
SET_ACTIVATE (menuitem);
- MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("Local mbox file"), A_LOCAL);
+ SET_ACTIVATE (menuitem);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("None (SMTP only)"), A_NONE);
SET_ACTIVATE (menuitem);
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
- inbox_label = gtk_label_new (_("Inbox"));
- gtk_widget_show (inbox_label);
- gtk_box_pack_start (GTK_BOX (hbox), inbox_label, FALSE, FALSE, 0);
-
- inbox_entry = gtk_entry_new ();
- gtk_widget_show (inbox_entry);
- gtk_widget_set_usize (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
- gtk_box_pack_start (GTK_BOX (hbox), inbox_entry, TRUE, TRUE, 0);
-
serv_table = gtk_table_new (6, 4, FALSE);
gtk_widget_show (serv_table);
gtk_box_pack_start (GTK_BOX (vbox2), serv_table, 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 ();
uid_entry = gtk_entry_new ();
gtk_widget_show (uid_entry);
- gtk_widget_set_usize (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
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);
pass_entry = gtk_entry_new ();
gtk_widget_show (pass_entry);
- gtk_widget_set_usize (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
- localmbox_label = gtk_label_new (_("Local mailbox file"));
+ localmbox_label = gtk_label_new (_("Local mailbox"));
gtk_widget_show (localmbox_label);
gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 3, 4,
GTK_FILL, 0, 0, 0);
gtk_table_attach (GTK_TABLE (serv_table), mailcmd_chkbtn, 0, 4, 5, 6,
GTK_EXPAND | GTK_FILL,
0, 0, TABLE_YPAD);
- gtk_signal_connect(GTK_OBJECT(mailcmd_chkbtn), "toggled",
- GTK_SIGNAL_FUNC(prefs_account_mailcmd_toggled),
- NULL);
+ g_signal_connect(G_OBJECT(mailcmd_chkbtn), "toggled",
+ G_CALLBACK(prefs_account_mailcmd_toggled),
+ NULL);
mailcmd_label = gtk_label_new (_("command to send mails"));
gtk_widget_show (mailcmd_label);
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.serv_frame = serv_frame;
basic.serv_table = serv_table;
basic.protocol_optmenu = optmenu;
- basic.inbox_label = inbox_label;
- basic.inbox_entry = inbox_entry;
basic.recvserv_label = recvserv_label;
basic.recvserv_entry = recvserv_entry;
basic.smtpserv_label = smtpserv_label;
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;
GtkWidget *vbox1;
GtkWidget *frame1;
GtkWidget *vbox2;
+ GtkWidget *use_apop_chkbtn;
GtkWidget *rmmail_chkbtn;
+ GtkWidget *hbox_spc;
+ GtkWidget *leave_time_label;
+ GtkWidget *leave_time_entry;
GtkWidget *getall_chkbtn;
- GtkWidget *recvatgetall_chkbtn;
+ GtkWidget *hbox1;
+ GtkWidget *size_limit_chkbtn;
+ GtkWidget *size_limit_entry;
+ GtkWidget *label;
GtkWidget *filter_on_recv_chkbtn;
+ GtkWidget *vbox3;
+ GtkWidget *inbox_label;
+ GtkWidget *inbox_entry;
+ GtkWidget *inbox_btn;
+ GtkWidget *imap_frame;
+ GtkWidget *optmenu;
+ GtkWidget *optmenu_menu;
+ GtkWidget *menuitem;
+ GtkWidget *recvatgetall_chkbtn;
+
+ GtkWidget *hbox2;
GtkWidget *frame2;
- GtkWidget *hbox1;
- GtkWidget *imapdir_label;
- GtkWidget *imapdir_entry;
+ GtkWidget *label_maxarticle;
+ GtkWidget *spinbtn_maxarticle;
+ GtkObject *spinbtn_maxarticle_adj;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (frame1), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ PACK_CHECK_BUTTON (vbox2, use_apop_chkbtn,
+ _("Use secure authentication (APOP)"));
+
PACK_CHECK_BUTTON (vbox2, rmmail_chkbtn,
_("Remove messages on server when received"));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox_spc);
+ gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+
+ leave_time_label = gtk_label_new (_("Remove after"));
+ gtk_widget_show (leave_time_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+
+ leave_time_entry = gtk_entry_new ();
+ gtk_widget_show (leave_time_entry);
+ 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_label = gtk_label_new (_("days"));
+ gtk_widget_show (leave_time_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+
+ SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
+
+ PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox_spc);
+ gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+
+ leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
+ gtk_widget_show (leave_time_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+
+ SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
+
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
_("Download all messages on server"));
- PACK_CHECK_BUTTON
- (vbox2, recvatgetall_chkbtn,
- _("`Get all' checks for new mail on this account"));
- PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
- _("Filter messages on receiving"));
- PACK_FRAME (vbox1, frame2, _("IMAP4"));
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (hbox1, size_limit_chkbtn, _("Receive size limit"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ 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);
+
+ 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_chkbtn, size_limit_entry);
+
+ PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ 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_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
+
+ inbox_btn = gtk_button_new_with_label (_(" Select... "));
+ gtk_widget_show (inbox_btn);
+ 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),
+ inbox_entry);
+
+ PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ label = gtk_label_new
+ (_("(Unfiltered messages will be stored in this folder)"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+ PACK_FRAME(vbox1, frame2, _("Maximum number of articles to download"));
+
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_container_add (GTK_CONTAINER (frame2), hbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox2), 8);
+
+ spinbtn_maxarticle_adj =
+ gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
+ spinbtn_maxarticle = gtk_spin_button_new
+ (GTK_ADJUSTMENT (spinbtn_maxarticle_adj), 10, 0);
+ gtk_widget_show (spinbtn_maxarticle);
+ gtk_box_pack_start (GTK_BOX (hbox2), spinbtn_maxarticle,
+ FALSE, FALSE, 0);
+ gtk_widget_set_size_request (spinbtn_maxarticle, 64, -1);
+ gtk_spin_button_set_numeric
+ (GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
+
+ label_maxarticle = gtk_label_new
+ (_("unlimited if 0 is specified"));
+ gtk_widget_show (label_maxarticle);
+ gtk_box_pack_start (GTK_BOX (hbox2), label_maxarticle, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
+
+ PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame2), vbox2);
+ gtk_container_add (GTK_CONTAINER (imap_frame), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
- imapdir_label = gtk_label_new (_("IMAP server directory"));
- gtk_widget_show (imapdir_label);
- gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+ label = gtk_label_new (_("Authentication method"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- imapdir_entry = gtk_entry_new();
- gtk_widget_show (imapdir_entry);
- gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
+ optmenu = gtk_option_menu_new ();
+ 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);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
- receive.pop3_frame = frame1;
- receive.rmmail_chkbtn = rmmail_chkbtn;
- receive.getall_chkbtn = getall_chkbtn;
- receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
- receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
+ PACK_CHECK_BUTTON (vbox1, filter_on_recv_chkbtn,
+ _("Filter messages on receiving"));
- receive.imap_frame = frame2;
- receive.imapdir_entry = imapdir_entry;
+ PACK_CHECK_BUTTON
+ (vbox1, recvatgetall_chkbtn,
+ _("`Get all' checks for new messages on this account"));
+
+ receive.pop3_frame = frame1;
+ receive.use_apop_chkbtn = use_apop_chkbtn;
+ receive.rmmail_chkbtn = rmmail_chkbtn;
+ receive.leave_time_entry = leave_time_entry;
+ receive.getall_chkbtn = getall_chkbtn;
+ receive.size_limit_chkbtn = size_limit_chkbtn;
+ receive.size_limit_entry = size_limit_entry;
+ receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
+ receive.inbox_label = inbox_label;
+ receive.inbox_entry = inbox_entry;
+ receive.inbox_btn = inbox_btn;
+
+ receive.imap_frame = imap_frame;
+ receive.imap_auth_type_optmenu = optmenu;
+
+ receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
+
+ receive.frame_maxarticle = frame2;
+ receive.spinbtn_maxarticle = spinbtn_maxarticle;
+ receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
}
static void prefs_account_send_create(void)
GtkWidget *hbox;
GtkWidget *customhdr_chkbtn;
GtkWidget *customhdr_edit_btn;
- GtkWidget *frame2;
- GtkWidget *table;
- GtkWidget *autocc_chkbtn;
- GtkWidget *autocc_entry;
- GtkWidget *autobcc_chkbtn;
- GtkWidget *autobcc_entry;
- GtkWidget *autoreplyto_chkbtn;
- GtkWidget *autoreplyto_entry;
- GtkWidget *frame3;
GtkWidget *vbox3;
GtkWidget *smtp_auth_chkbtn;
+ GtkWidget *optmenu;
+ GtkWidget *optmenu_menu;
+ GtkWidget *menuitem;
+ GtkWidget *vbox4;
+ GtkWidget *hbox_spc;
+ GtkWidget *label;
+ GtkWidget *smtp_uid_entry;
+ 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);
gtk_widget_show (customhdr_edit_btn);
gtk_box_pack_start (GTK_BOX (hbox), customhdr_edit_btn,
FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (customhdr_edit_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_account_edit_custom_header),
- NULL);
+ g_signal_connect (G_OBJECT (customhdr_edit_btn), "clicked",
+ G_CALLBACK (prefs_account_edit_custom_header),
+ NULL);
SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
- PACK_FRAME (vbox1, frame2, _("Automatically set following addresses"));
-
- table = gtk_table_new (3, 2, FALSE);
- gtk_widget_show (table);
- gtk_container_add (GTK_CONTAINER (frame2), table);
- gtk_container_set_border_width (GTK_CONTAINER (table), 8);
- gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
- gtk_table_set_col_spacings (GTK_TABLE (table), 8);
+ PACK_FRAME (vbox1, frame, _("Authentication"));
+
+ vbox3 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox3);
+ gtk_container_add (GTK_CONTAINER (frame), vbox3);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+ PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
+ _("SMTP Authentication (SMTP AUTH)"));
+
+ vbox4 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox4);
+ gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
+
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox4), 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_size_request (hbox_spc, 12, -1);
+
+ label = gtk_label_new (_("Authentication method"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ optmenu = gtk_option_menu_new ();
+ 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, "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);
+
+ PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox4), 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_size_request (hbox_spc, 12, -1);
+
+ label = gtk_label_new (_("User ID"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ smtp_uid_entry = gtk_entry_new ();
+ gtk_widget_show (smtp_uid_entry);
+ 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);
+
+ label = gtk_label_new (_("Password"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ smtp_pass_entry = gtk_entry_new ();
+ gtk_widget_show (smtp_pass_entry);
+ gtk_widget_set_size_request (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
+ gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
+
+ PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox4), 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_size_request (hbox_spc, 12, -1);
+
+ label = gtk_label_new
+ (_("If you leave these entries empty, the same\n"
+ "user ID and password as receiving will be used."));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+ SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
+
+ PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
+ _("Authenticate with POP3 before sending"));
+
+ g_signal_connect (G_OBJECT (pop_bfr_smtp_chkbtn), "clicked",
+ G_CALLBACK (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_size_request (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_size_request (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_auth_chkbtn = smtp_auth_chkbtn;
+ p_send.smtp_auth_type_optmenu = optmenu;
+ 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 *sig_hbox;
+ 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 *sigfile_radiobtn;
+ GtkWidget *sigcmd_radiobtn;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *autocc_chkbtn;
+ GtkWidget *autocc_entry;
+ GtkWidget *autobcc_chkbtn;
+ GtkWidget *autobcc_entry;
+ GtkWidget *autoreplyto_chkbtn;
+ GtkWidget *autoreplyto_entry;
+
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox1);
+ gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+ PACK_FRAME(vbox1, frame_sig, _("Signature"));
+
+ 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"));
+
+ 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_size_request (entry_sigsep, 64, -1);
+
+ sig_hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (sig_hbox);
+ gtk_box_pack_start (GTK_BOX (vbox_sig), sig_hbox, FALSE, FALSE, 0);
+
+ sigfile_radiobtn = gtk_radio_button_new_with_label (NULL, _("File"));
+ gtk_widget_show (sigfile_radiobtn);
+ gtk_box_pack_start (GTK_BOX (sig_hbox), sigfile_radiobtn,
+ FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (sigfile_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SIG_FILE));
+
+ sigcmd_radiobtn = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON(sigfile_radiobtn), _("Command output"));
+ gtk_widget_show (sigcmd_radiobtn);
+ gtk_box_pack_start (GTK_BOX (sig_hbox), sigcmd_radiobtn,
+ FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (sigcmd_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SIG_COMMAND));
+
+ 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"));
+ 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"));
+
+ table = gtk_table_new (3, 2, FALSE);
+ gtk_widget_show (table);
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+ gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 8);
autocc_chkbtn = gtk_check_button_new_with_label (_("Cc"));
gtk_widget_show (autocc_chkbtn);
SET_TOGGLE_SENSITIVITY (autoreplyto_chkbtn, autoreplyto_entry);
- PACK_FRAME (vbox1, frame3, _("Authentication"));
-
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (frame3), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
- PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
- _("SMTP Authentication (SMTP AUTH)"));
- PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
- _("Authenticate with POP3 before sending"));
- gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
-
- send.date_chkbtn = date_chkbtn;
- send.msgid_chkbtn = msgid_chkbtn;
- send.customhdr_chkbtn = customhdr_chkbtn;
-
- send.autocc_chkbtn = autocc_chkbtn;
- send.autocc_entry = autocc_entry;
- send.autobcc_chkbtn = autobcc_chkbtn;
- send.autobcc_entry = autobcc_entry;
- send.autoreplyto_chkbtn = autoreplyto_chkbtn;
- send.autoreplyto_entry = autoreplyto_entry;
-
- send.smtp_auth_chkbtn = smtp_auth_chkbtn;
- send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
-}
-
-static void prefs_account_compose_create(void)
-{
- GtkWidget *vbox1;
- GtkWidget *hbox;
- GtkWidget *label;
- GtkWidget *sigpath_entry;
-
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox1);
- 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);
-
- label = gtk_label_new (_("Signature file"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
- sigpath_entry = gtk_entry_new ();
- gtk_widget_show (sigpath_entry);
- gtk_box_pack_start (GTK_BOX (hbox), sigpath_entry, TRUE, TRUE, 0);
-
- compose.sigpath_entry = sigpath_entry;
+ compose.sigfile_radiobtn = sigfile_radiobtn;
+ 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;
+ compose.autobcc_chkbtn = autobcc_chkbtn;
+ compose.autobcc_entry = autobcc_entry;
+ compose.autoreplyto_chkbtn = autoreplyto_chkbtn;
+ compose.autoreplyto_entry = autoreplyto_entry;
}
-#if USE_GPGME
static void prefs_account_privacy_create(void)
{
GtkWidget *vbox1;
- GtkWidget *frame1;
GtkWidget *vbox2;
GtkWidget *hbox1;
GtkWidget *label;
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
+ GtkWidget *default_privacy_system;
+ GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_sign_chkbtn;
+ GtkWidget *save_clear_text_chkbtn;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME (vbox1, frame1, _("Sign key"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
- defaultkey_radiobtn = gtk_radio_button_new_with_label
- (NULL, _("Use default GnuPG key"));
- gtk_widget_show (defaultkey_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox2), defaultkey_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (defaultkey_radiobtn),
- GINT_TO_POINTER (SIGN_KEY_DEFAULT));
-
- emailkey_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (defaultkey_radiobtn),
- _("Select key by your email address"));
- gtk_widget_show (emailkey_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox2), emailkey_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (emailkey_radiobtn),
- GINT_TO_POINTER (SIGN_KEY_BY_FROM));
-
- customkey_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (defaultkey_radiobtn),
- _("Specify key manually"));
- gtk_widget_show (customkey_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox2), customkey_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (customkey_radiobtn),
- GINT_TO_POINTER (SIGN_KEY_CUSTOM));
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER(vbox2), hbox1);
- label = gtk_label_new ("");
- gtk_widget_show (label);
+ label = gtk_label_new(_("Default privacy system"));
+ gtk_widget_show(label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_widget_set_usize (label, 16, -1);
- label = gtk_label_new (_("User or key ID:"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-
- customkey_entry = gtk_entry_new ();
- gtk_widget_show (customkey_entry);
- gtk_box_pack_start (GTK_BOX (hbox1), customkey_entry,
- TRUE, TRUE, 0);
+ default_privacy_system = gtk_option_menu_new();
+ gtk_widget_show (default_privacy_system);
+ gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, TRUE, TRUE, 0);
+
+ PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
+ _("Encrypt message by default"));
+ PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
+ _("Sign message by default"));
+ PACK_CHECK_BUTTON (vbox2, save_clear_text_chkbtn,
+ _("Save sent encrypted messages as clear text"));
+
+ privacy.default_privacy_system = default_privacy_system;
+ privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
+ privacy.default_sign_chkbtn = default_sign_chkbtn;
+ privacy.save_clear_text_chkbtn = save_clear_text_chkbtn;
+}
- SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
+#if USE_OPENSSL
+
+#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data) \
+{ \
+ btn = gtk_radio_button_new_with_label_from_widget \
+ (GTK_RADIO_BUTTON (btn_p), label); \
+ gtk_widget_show (btn); \
+ gtk_box_pack_start (GTK_BOX (box), btn, FALSE, FALSE, 0); \
+ g_object_set_data (G_OBJECT (btn), \
+ MENU_VAL_ID, \
+ GINT_TO_POINTER (data)); \
+}
- privacy.defaultkey_radiobtn = defaultkey_radiobtn;
- privacy.emailkey_radiobtn = emailkey_radiobtn;
- privacy.customkey_radiobtn = customkey_radiobtn;
- privacy.customkey_entry = customkey_entry;
+#define CREATE_RADIO_BUTTONS(box, \
+ btn1, btn1_label, btn1_data, \
+ btn2, btn2_label, btn2_data, \
+ btn3, btn3_label, btn3_data) \
+{ \
+ btn1 = gtk_radio_button_new_with_label(NULL, btn1_label); \
+ gtk_widget_show (btn1); \
+ gtk_box_pack_start (GTK_BOX (box), btn1, FALSE, FALSE, 0); \
+ g_object_set_data (G_OBJECT (btn1), \
+ MENU_VAL_ID, \
+ GINT_TO_POINTER (btn1_data)); \
+ \
+ CREATE_RADIO_BUTTON(box, btn2, btn1, btn2_label, btn2_data); \
+ CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data); \
}
-#endif /* USE_GPGME */
-#if USE_SSL
static void prefs_account_ssl_create(void)
{
GtkWidget *vbox1;
- GtkWidget *receive_frame;
+ GtkWidget *pop_frame;
GtkWidget *vbox2;
- GtkWidget *pop_chkbtn;
- GtkWidget *imap_chkbtn;
+ GtkWidget *pop_nossl_radiobtn;
+ GtkWidget *pop_ssltunnel_radiobtn;
+ GtkWidget *pop_starttls_radiobtn;
- GtkWidget *send_frame;
+ GtkWidget *imap_frame;
GtkWidget *vbox3;
+ GtkWidget *imap_nossl_radiobtn;
+ GtkWidget *imap_ssltunnel_radiobtn;
+ GtkWidget *imap_starttls_radiobtn;
+
+ GtkWidget *nntp_frame;
+ GtkWidget *vbox4;
+ GtkWidget *nntp_nossl_radiobtn;
+ GtkWidget *nntp_ssltunnel_radiobtn;
+
+ GtkWidget *send_frame;
+ GtkWidget *vbox5;
GtkWidget *smtp_nossl_radiobtn;
GtkWidget *smtp_ssltunnel_radiobtn;
- GtkWidget *smtp_sslstarttls_radiobtn;
+ GtkWidget *smtp_starttls_radiobtn;
+
+ GtkWidget *vbox6;
+ GtkWidget *use_nonblocking_ssl_chkbtn;
+ GtkWidget *hbox;
+ GtkWidget *hbox_spc;
+ GtkWidget *label;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME (vbox1, receive_frame, _("Receive"));
-
+ PACK_FRAME (vbox1, pop_frame, _("POP3"));
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (receive_frame), vbox2);
+ gtk_container_add (GTK_CONTAINER (pop_frame), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
- PACK_CHECK_BUTTON (vbox2, pop_chkbtn,
- _("Use SSL for POP3 connection"));
- PACK_CHECK_BUTTON (vbox2, imap_chkbtn,
- _("Use SSL for IMAP4 connection"));
-
- PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
-
+ CREATE_RADIO_BUTTONS(vbox2,
+ pop_nossl_radiobtn,
+ _("Don't use SSL"),
+ SSL_NONE,
+ pop_ssltunnel_radiobtn,
+ _("Use SSL for POP3 connection"),
+ SSL_TUNNEL,
+ pop_starttls_radiobtn,
+ _("Use STARTTLS command to start SSL session"),
+ SSL_STARTTLS);
+
+ PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
vbox3 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (send_frame), vbox3);
+ gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
- smtp_nossl_radiobtn =
- gtk_radio_button_new_with_label(NULL, _("Don't use SSL"));
- gtk_widget_show (smtp_nossl_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox3), smtp_nossl_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (smtp_nossl_radiobtn),
- GINT_TO_POINTER (SSL_SMTP_NONE));
-
- smtp_ssltunnel_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
- _("Use SSL for SMTP connection"));
- gtk_widget_show (smtp_ssltunnel_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox3), smtp_ssltunnel_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (smtp_ssltunnel_radiobtn),
- GINT_TO_POINTER (SSL_SMTP_TUNNEL));
-
- smtp_sslstarttls_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
- _("Use STARTTLS command to start SSL session"));
- gtk_widget_show (smtp_sslstarttls_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox3), smtp_sslstarttls_radiobtn,
+ CREATE_RADIO_BUTTONS(vbox3,
+ imap_nossl_radiobtn,
+ _("Don't use SSL"),
+ SSL_NONE,
+ imap_ssltunnel_radiobtn,
+ _("Use SSL for IMAP4 connection"),
+ SSL_TUNNEL,
+ imap_starttls_radiobtn,
+ _("Use STARTTLS command to start SSL session"),
+ SSL_STARTTLS);
+
+ PACK_FRAME (vbox1, nntp_frame, _("NNTP"));
+ vbox4 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox4);
+ gtk_container_add (GTK_CONTAINER (nntp_frame), vbox4);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
+
+ nntp_nossl_radiobtn =
+ gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
+ gtk_widget_show (nntp_nossl_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (smtp_sslstarttls_radiobtn),
- GINT_TO_POINTER (SSL_SMTP_STARTTLS));
+ g_object_set_data (G_OBJECT (nntp_nossl_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SSL_NONE));
- ssl.receive_frame = receive_frame;
- ssl.pop_chkbtn = pop_chkbtn;
- ssl.imap_chkbtn = imap_chkbtn;
+ CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
+ _("Use SSL for NNTP connection"), SSL_TUNNEL);
- ssl.send_frame = send_frame;
- ssl.smtp_nossl_radiobtn = smtp_nossl_radiobtn;
- ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
- ssl.smtp_sslstarttls_radiobtn = smtp_sslstarttls_radiobtn;
+ PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
+ vbox5 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox5);
+ gtk_container_add (GTK_CONTAINER (send_frame), vbox5);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox5), 8);
+
+ CREATE_RADIO_BUTTONS(vbox5,
+ smtp_nossl_radiobtn,
+ _("Don't use SSL (but, if necessary, use STARTTLS)"),
+ SSL_NONE,
+ smtp_ssltunnel_radiobtn,
+ _("Use SSL for SMTP connection"),
+ SSL_TUNNEL,
+ smtp_starttls_radiobtn,
+ _("Use STARTTLS command to start SSL session"),
+ SSL_STARTTLS);
+
+ vbox6 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox6);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox6, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON(vbox6, use_nonblocking_ssl_chkbtn,
+ _("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);
+
+ 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_size_request (hbox_spc, 16, -1);
+
+ label = gtk_label_new
+ (_("(Turn this off if you have SSL connection problems)"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ ssl.pop_frame = pop_frame;
+ ssl.pop_nossl_radiobtn = pop_nossl_radiobtn;
+ ssl.pop_ssltunnel_radiobtn = pop_ssltunnel_radiobtn;
+ ssl.pop_starttls_radiobtn = pop_starttls_radiobtn;
+
+ ssl.imap_frame = imap_frame;
+ ssl.imap_nossl_radiobtn = imap_nossl_radiobtn;
+ ssl.imap_ssltunnel_radiobtn = imap_ssltunnel_radiobtn;
+ ssl.imap_starttls_radiobtn = imap_starttls_radiobtn;
+
+ ssl.nntp_frame = nntp_frame;
+ ssl.nntp_nossl_radiobtn = nntp_nossl_radiobtn;
+ ssl.nntp_ssltunnel_radiobtn = nntp_ssltunnel_radiobtn;
+
+ ssl.send_frame = send_frame;
+ ssl.smtp_nossl_radiobtn = smtp_nossl_radiobtn;
+ ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
+ ssl.smtp_starttls_radiobtn = smtp_starttls_radiobtn;
+
+ ssl.use_nonblocking_ssl_chkbtn = use_nonblocking_ssl_chkbtn;
+}
+
+#undef CREATE_RADIO_BUTTONS
+#undef CREATE_RADIO_BUTTON
+#endif /* USE_OPENSSL */
+
+static void crosspost_color_toggled(void)
+{
+ gboolean is_active;
+
+ is_active = gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON(advanced.crosspost_chkbtn));
+ gtk_widget_set_sensitive(advanced.crosspost_colormenu, is_active);
+}
+
+static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced.crosspost_colormenu));
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ *((gint *)pparam->data) = GPOINTER_TO_INT
+ (g_object_get_data(G_OBJECT(menuitem), "color"));
}
-#endif /* USE_SSL */
+
+static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
+{
+ gint colorlabel = *((gint *)pparam->data);
+ GtkOptionMenu *colormenu = GTK_OPTION_MENU(*pparam->widget);
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ gtk_option_menu_set_history(colormenu, colorlabel);
+ menu = gtk_option_menu_get_menu(colormenu);
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
static void prefs_account_advanced_create(void)
{
GtkWidget *entry_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
+ GtkWidget *checkbtn_crosspost;
+ GtkWidget *colormenu_crosspost;
+ GtkWidget *menu;
+ GtkWidget *checkbtn_tunnelcmd;
+ GtkWidget *entry_tunnelcmd;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_entry;
+ GtkWidget *folder_frame;
+ GtkWidget *vbox3;
+ GtkWidget *table;
+ GtkWidget *sent_folder_chkbtn;
+ GtkWidget *sent_folder_entry;
+ GtkWidget *draft_folder_chkbtn;
+ GtkWidget *draft_folder_entry;
+ GtkWidget *trash_folder_chkbtn;
+ GtkWidget *trash_folder_entry;
#define PACK_HBOX(hbox) \
-{ \
+ { \
hbox = gtk_hbox_new (FALSE, 8); \
gtk_widget_show (hbox); \
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); \
-}
+ }
#define PACK_PORT_ENTRY(box, entry) \
-{ \
- entry = gtk_entry_new_with_max_length (5); \
+ { \
+ 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_usize (entry, 64, -1); \
-}
+ gtk_widget_set_size_request (entry, 64, -1); \
+ }
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
+
+ PACK_HBOX (hbox1);
+ PACK_CHECK_BUTTON (hbox1, checkbtn_tunnelcmd,
+ _("Use command to communicate with server"));
+ entry_tunnelcmd = gtk_entry_new ();
+ gtk_widget_show (entry_tunnelcmd);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_tunnelcmd, TRUE, TRUE, 0);
+ SET_TOGGLE_SENSITIVITY (checkbtn_tunnelcmd, entry_tunnelcmd);
+
+ PACK_HBOX (hbox1);
+ 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();
+ 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);
+ SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
+
+ PACK_HBOX (hbox1);
+ imapdir_label = gtk_label_new (_("IMAP server directory"));
+ gtk_widget_show (imapdir_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+
+ imapdir_entry = gtk_entry_new();
+ gtk_widget_show (imapdir_entry);
+ gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
+
#undef PACK_HBOX
#undef PACK_PORT_ENTRY
+ /* special folder setting (maybe these options are redundant) */
+
+ PACK_FRAME (vbox1, folder_frame, _("Folder"));
+
+ vbox3 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox3);
+ gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+ table = gtk_table_new (3, 3, FALSE);
+ gtk_widget_show (table);
+ gtk_container_add (GTK_CONTAINER (vbox3), table);
+ gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+
+#define SET_CHECK_BTN_AND_ENTRY(label, chkbtn, entry, n) \
+{ \
+ GtkWidget *button; \
+ \
+ chkbtn = gtk_check_button_new_with_label (label); \
+ gtk_widget_show (chkbtn); \
+ gtk_table_attach (GTK_TABLE (table), chkbtn, \
+ 0, 1, n, n + 1, GTK_FILL, 0, 0, 0); \
+ \
+ entry = gtk_entry_new (); \
+ gtk_widget_show (entry); \
+ gtk_table_attach (GTK_TABLE (table), entry, 1, 2, n, n + 1, \
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, \
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); \
+ \
+ button = gtk_button_new_with_label (_(" ... ")); \
+ gtk_widget_show (button); \
+ gtk_table_attach (GTK_TABLE (table), button, \
+ 2, 3, n, n + 1, GTK_FILL, 0, 0, 0); \
+ g_signal_connect \
+ (G_OBJECT (button), "clicked", \
+ G_CALLBACK (prefs_account_select_folder_cb), \
+ entry); \
+ \
+ SET_TOGGLE_SENSITIVITY (chkbtn, entry); \
+ SET_TOGGLE_SENSITIVITY (chkbtn, button); \
+}
+
+ SET_CHECK_BTN_AND_ENTRY(_("Put sent messages in"),
+ sent_folder_chkbtn, sent_folder_entry, 0);
+ SET_CHECK_BTN_AND_ENTRY(_("Put draft messages in"),
+ draft_folder_chkbtn, draft_folder_entry, 1);
+ SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages in"),
+ trash_folder_chkbtn, trash_folder_entry, 2);
+
advanced.smtpport_chkbtn = checkbtn_smtpport;
advanced.smtpport_entry = entry_smtpport;
advanced.popport_hbox = hbox_popport;
advanced.nntpport_entry = entry_nntpport;
advanced.domain_chkbtn = checkbtn_domain;
advanced.domain_entry = entry_domain;
+ advanced.crosspost_chkbtn = checkbtn_crosspost;
+ advanced.crosspost_colormenu = colormenu_crosspost;
+
+ advanced.tunnelcmd_chkbtn = checkbtn_tunnelcmd;
+ advanced.tunnelcmd_entry = entry_tunnelcmd;
+ advanced.imapdir_label = imapdir_label;
+ advanced.imapdir_entry = imapdir_entry;
+
+ advanced.sent_folder_chkbtn = sent_folder_chkbtn;
+ advanced.sent_folder_entry = sent_folder_entry;
+ advanced.draft_folder_chkbtn = draft_folder_chkbtn;
+ advanced.draft_folder_entry = draft_folder_entry;
+ advanced.trash_folder_chkbtn = trash_folder_chkbtn;
+ advanced.trash_folder_entry = trash_folder_entry;
}
static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
return TRUE;
}
-static void prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
+static gboolean prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
prefs_account_cancel();
+ return FALSE;
}
static void prefs_account_ok(void)
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(basic.protocol_optmenu));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
protocol = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
+ alertpanel_error(_("Account name is not entered."));
+ return -1;
+ }
if (*gtk_entry_get_text(GTK_ENTRY(basic.addr_entry)) == '\0') {
alertpanel_error(_("Mail address is not entered."));
return -1;
}
- if ((protocol == A_POP3 || protocol == A_APOP || (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn)))) &&
+ if (((protocol == A_POP3) ||
+ (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn))) ||
+ (protocol == A_NONE)) &&
*gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
alertpanel_error(_("SMTP server is not entered."));
return -1;
}
- if ((protocol == A_POP3 || protocol == A_APOP || protocol == A_LOCAL) &&
+ if ((protocol == A_POP3 || protocol == A_IMAP4) &&
*gtk_entry_get_text(GTK_ENTRY(basic.uid_entry)) == '\0') {
alertpanel_error(_("User ID is not entered."));
return -1;
}
- if ((protocol == A_POP3 || protocol == A_APOP) &&
+ if (protocol == A_POP3 &&
*gtk_entry_get_text(GTK_ENTRY(basic.recvserv_entry)) == '\0') {
alertpanel_error(_("POP3 server is not entered."));
return -1;
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;
+ gchar *id;
+
+ item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
+ if (item && item->path) {
+ id = folder_item_get_identifier(item);
+ if (id) {
+ gtk_entry_set_text(GTK_ENTRY(data), id);
+ g_free(id);
+ }
+ }
+}
+
static void prefs_account_edit_custom_header(void)
{
prefs_custom_header_open(&tmp_ac_prefs);
}
-#if USE_GPGME || USE_SSL
static void prefs_account_enum_set_data_from_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
GSList *group;
radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
- group = gtk_radio_button_group (radiobtn);
+ group = gtk_radio_button_get_group (radiobtn);
while (group != NULL) {
GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
if (gtk_toggle_button_get_active (btn)) {
*((gint *)pparam->data) = GPOINTER_TO_INT
- (gtk_object_get_user_data (GTK_OBJECT (btn)));
+ (g_object_get_data (G_OBJECT (btn), MENU_VAL_ID));
break;
}
group = group->next;
data = GINT_TO_POINTER (*((gint *)pparam->data));
radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
- group = gtk_radio_button_group (radiobtn);
+ group = gtk_radio_button_get_group (radiobtn);
while (group != NULL) {
GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
- gpointer data1 = gtk_object_get_user_data (GTK_OBJECT (btn));
+ gpointer data1 = g_object_get_data (G_OBJECT (btn), MENU_VAL_ID);
if (data1 == data) {
gtk_toggle_button_set_active (btn, TRUE);
break;
}
}
-#endif /* USE_GPGME */
-
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
{
GtkWidget *menu;
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
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
}
static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
GtkWidget *menu;
GtkWidget *menuitem;
+ gint index;
protocol = *((RecvProtocol *)pparam->data);
+ index = menu_find_option_menu_index
+ (optmenu, GINT_TO_POINTER(protocol), NULL);
+ if (index < 0) return;
+ gtk_option_menu_set_history(optmenu, index);
- switch (protocol) {
- case A_POP3:
- gtk_option_menu_set_history(optmenu, 0);
- break;
- case A_APOP:
+ menu = gtk_option_menu_get_menu(optmenu);
+ menu_set_insensitive_all(GTK_MENU_SHELL(menu));
+
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_widget_set_sensitive(menuitem, TRUE);
+ gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
+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));
+}
+
+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;
+
+ switch (type) {
+ case IMAP_AUTH_LOGIN:
gtk_option_menu_set_history(optmenu, 1);
break;
- case A_IMAP4:
+ case IMAP_AUTH_CRAM_MD5:
gtk_option_menu_set_history(optmenu, 2);
break;
- case A_NNTP:
- gtk_option_menu_set_history(optmenu, 3);
+ 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));
+}
+
+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));
+}
+
+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_LOGIN:
+ gtk_option_menu_set_history(optmenu, 1);
break;
- case A_LOCAL:
- gtk_option_menu_set_history(optmenu, 4);
+ case SMTPAUTH_CRAM_MD5:
+ gtk_option_menu_set_history(optmenu, 2);
break;
- /*
- case A_LOCAL_CMD:
- gtk_option_menu_set_history(optmenu, 5);
+ case SMTPAUTH_DIGEST_MD5:
+ gtk_option_menu_set_history(optmenu, 3);
break;
- */
+ case 0:
default:
- break;
+ gtk_option_menu_set_history(optmenu, 0);
}
menu = gtk_option_menu_get_menu(optmenu);
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
+static void prefs_account_set_string_from_optmenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ 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;
+
+ str = (gchar **) pparam->data;
+ g_free(*str);
+ *str = g_strdup(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+}
+
+static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
+{
+ GtkWidget *optionmenu;
+ GtkWidget *menu;
+ gboolean found = FALSE;
+ GList *children, *cur;
+ gchar *prefsid;
+ guint i = 0;
+
+ g_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);
+ }
+ i++;
+ }
+
+ if (!found) {
+ gchar *name;
+ GtkWidget *menuitem;
+
+ name = g_strdup_printf(_("Unsupported (%s)"), prefsid);
+ menuitem = gtk_menu_item_new_with_label(name);
+ gtk_widget_show(menuitem);
+ g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, g_strdup(prefsid), g_free);
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+ g_free(name);
+
+ gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
+ }
+
+ g_list_free(children);
+}
+
static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
{
RecvProtocol protocol;
- gboolean active;
- gint auth;
protocol = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
switch(protocol) {
case A_NNTP:
- gtk_widget_set_sensitive(basic.inbox_label, FALSE);
- gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_show(basic.nntpserv_label);
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.imap_frame, FALSE);
-#if USE_SSL
- gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
- gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
- gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
- gtk_widget_set_sensitive(ssl.send_frame, FALSE);
+ gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
+ gtk_widget_show(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
+ /* update pop_before_smtp sensitivity */
+ 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_OPENSSL
+ gtk_widget_hide(ssl.pop_frame);
+ gtk_widget_hide(ssl.imap_frame);
+ gtk_widget_show(ssl.nntp_frame);
+ gtk_widget_hide(ssl.send_frame);
#endif
gtk_widget_hide(advanced.popport_hbox);
gtk_widget_hide(advanced.imapport_hbox);
gtk_widget_show(advanced.nntpport_hbox);
+ gtk_widget_show(advanced.crosspost_chkbtn);
+ gtk_widget_show(advanced.crosspost_colormenu);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
case A_LOCAL:
- gtk_widget_set_sensitive(basic.inbox_label, TRUE);
- gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
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_widget_set_sensitive(basic.pass_label, TRUE);
gtk_widget_set_sensitive(basic.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
- gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
- gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+ gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
+ gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
-#if USE_SSL
- gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
- gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
- gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
- gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+ /* update pop_before_smtp sensitivity */
+ 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),
+ TRUE);
+ }
+
+#if USE_OPENSSL
+ gtk_widget_hide(ssl.pop_frame);
+ gtk_widget_hide(ssl.imap_frame);
+ gtk_widget_hide(ssl.nntp_frame);
+ gtk_widget_show(ssl.send_frame);
#endif
gtk_widget_hide(advanced.popport_hbox);
gtk_widget_hide(advanced.imapport_hbox);
gtk_widget_hide(advanced.nntpport_hbox);
+ gtk_widget_hide(advanced.crosspost_chkbtn);
+ gtk_widget_hide(advanced.crosspost_colormenu);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
case A_IMAP4:
- gtk_widget_set_sensitive(basic.inbox_label, FALSE);
- gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
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.pass_label, TRUE);
gtk_widget_set_sensitive(basic.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
- gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
- gtk_widget_set_sensitive(receive.imap_frame, TRUE);
+ gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_show(receive.imap_frame);
+ gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
-#if USE_SSL
- gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
- gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
- gtk_widget_set_sensitive(ssl.imap_chkbtn, TRUE);
- gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+ /* update pop_before_smtp sensitivity */
+ 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_OPENSSL
+ gtk_widget_hide(ssl.pop_frame);
+ gtk_widget_show(ssl.imap_frame);
+ gtk_widget_hide(ssl.nntp_frame);
+ gtk_widget_show(ssl.send_frame);
#endif
gtk_widget_hide(advanced.popport_hbox);
gtk_widget_show(advanced.imapport_hbox);
gtk_widget_hide(advanced.nntpport_hbox);
+ gtk_widget_hide(advanced.crosspost_chkbtn);
+ gtk_widget_hide(advanced.crosspost_colormenu);
+ gtk_widget_show(advanced.tunnelcmd_chkbtn);
+ gtk_widget_show(advanced.tunnelcmd_entry);
+ gtk_widget_show(advanced.imapdir_label);
+ gtk_widget_show(advanced.imapdir_entry);
+ break;
+ case A_NONE:
+ gtk_widget_hide(basic.nntpserv_label);
+ gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 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, FALSE);
+ gtk_widget_set_sensitive(basic.recvserv_entry, FALSE);
+ gtk_widget_hide(basic.recvserv_label);
+ gtk_widget_hide(basic.recvserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, VSPACING_NARROW);
+ gtk_widget_show(basic.smtpserv_label);
+ gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
+ gtk_widget_hide(basic.localmbox_label);
+ gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
+ gtk_widget_hide(basic.mailcmd_label);
+ gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
+ gtk_widget_hide(basic.mailcmd_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_hide(basic.uid_label);
+ gtk_widget_hide(basic.pass_label);
+ gtk_widget_hide(basic.uid_entry);
+ gtk_widget_hide(basic.pass_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, VSPACING_NARROW);
+
+ gtk_widget_set_sensitive(basic.uid_label, FALSE);
+ gtk_widget_set_sensitive(basic.pass_label, FALSE);
+ gtk_widget_set_sensitive(basic.uid_entry, FALSE);
+ gtk_widget_set_sensitive(basic.pass_entry, FALSE);
+ gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+ gtk_widget_hide(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
+ gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
+
+ gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
+ gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
+
+ /* update pop_before_smtp sensitivity */
+ gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+ pop_bfr_smtp_tm_set_sens(NULL, NULL);
+
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
+
+#if USE_OPENSSL
+ gtk_widget_hide(ssl.pop_frame);
+ gtk_widget_hide(ssl.imap_frame);
+ gtk_widget_hide(ssl.nntp_frame);
+ gtk_widget_show(ssl.send_frame);
+#endif
+ gtk_widget_hide(advanced.popport_hbox);
+ gtk_widget_hide(advanced.imapport_hbox);
+ gtk_widget_hide(advanced.nntpport_hbox);
+ gtk_widget_hide(advanced.crosspost_chkbtn);
+ gtk_widget_hide(advanced.crosspost_colormenu);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
case A_POP3:
default:
- gtk_widget_set_sensitive(basic.inbox_label, TRUE);
- gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
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.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_set_sensitive(receive.pop3_frame, TRUE);
- gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+ gtk_widget_show(receive.pop3_frame);
+ gtk_widget_hide(receive.imap_frame);
+ gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
+
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
-#if USE_SSL
- gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
- gtk_widget_set_sensitive(ssl.pop_chkbtn, TRUE);
- gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
- gtk_widget_set_sensitive(ssl.send_frame, 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
+ (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+ TRUE);
+ }
+
+#if USE_OPENSSL
+ gtk_widget_show(ssl.pop_frame);
+ gtk_widget_hide(ssl.imap_frame);
+ gtk_widget_hide(ssl.nntp_frame);
+ gtk_widget_show(ssl.send_frame);
#endif
gtk_widget_show(advanced.popport_hbox);
gtk_widget_hide(advanced.imapport_hbox);
gtk_widget_hide(advanced.nntpport_hbox);
+ gtk_widget_hide(advanced.crosspost_chkbtn);
+ gtk_widget_hide(advanced.crosspost_colormenu);
+ gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+ gtk_widget_hide(advanced.tunnelcmd_entry);
+ gtk_widget_hide(advanced.imapdir_label);
+ gtk_widget_hide(advanced.imapdir_entry);
break;
}
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