/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 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 "defs.h"
+#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#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 "utils.h"
#include "alertpanel.h"
#include "colorlabel.h"
+#include "smtp.h"
+#include "imap.h"
+#include "remotefolder.h"
+#include "base64.h"
static gboolean cancelled;
+static gboolean new_account;
static PrefsAccount tmp_ac_prefs;
-static PrefsDialog dialog;
+static GtkWidget *notebook;
+
+static GSList *prefs_pages = NULL;
static struct Basic {
GtkWidget *acname_entry;
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 *sd_filter_on_recv_chkbtn;
- GtkWidget *sd_rmmail_chkbtn;
GtkWidget *size_limit_chkbtn;
GtkWidget *size_limit_entry;
- GtkWidget *filter_on_recv_chkbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
+ GtkWidget *filter_on_recv_chkbtn;
GtkWidget *recvatgetall_chkbtn;
+
+ GtkWidget *imap_frame;
+ 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 *sigpath_entry;
-
+ GtkWidget *sigfile_radiobtn;
+ GtkWidget *entry_sigpath;
+ GtkWidget *checkbtn_autosig;
+ GtkWidget *entry_sigsep;
GtkWidget *autocc_chkbtn;
GtkWidget *autocc_entry;
GtkWidget *autobcc_chkbtn;
GtkWidget *autoreplyto_entry;
} compose;
-#if USE_GPGME
static struct Privacy {
+ GtkWidget *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_encrypt_reply_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *ascii_armored_chkbtn;
- GtkWidget *clearsign_chkbtn;
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
+ GtkWidget *save_clear_text_chkbtn;
} privacy;
-#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
static struct SSLPrefs {
GtkWidget *pop_frame;
GtkWidget *pop_nossl_radiobtn;
GtkWidget *smtp_nossl_radiobtn;
GtkWidget *smtp_ssltunnel_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 *tunnelcmd_chkbtn;
- GtkWidget *tunnelcmd_entry;
GtkWidget *crosspost_chkbtn;
GtkWidget *crosspost_colormenu;
- GtkWidget *imap_frame;
+ GtkWidget *tunnelcmd_chkbtn;
+ GtkWidget *tunnelcmd_entry;
+ GtkWidget *imapdir_label;
GtkWidget *imapdir_entry;
GtkWidget *sent_folder_chkbtn;
GtkWidget *sent_folder_entry;
+ GtkWidget *queue_folder_chkbtn;
+ GtkWidget *queue_folder_entry;
GtkWidget *draft_folder_chkbtn;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_chkbtn;
static void prefs_account_protocol_set_optmenu (PrefParam *pparam);
static void prefs_account_protocol_activated (GtkMenuItem *menuitem);
+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);
-#if USE_GPGME || USE_SSL
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 */
-
-#if USE_GPGME
-static void prefs_account_ascii_armored_warning (GtkWidget *widget);
-#endif /* USE_GPGME */
static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
static void prefs_account_crosspost_set_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 gchar *privacy_prefs;
static PrefParam param[] = {
/* Basic */
{"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 -t", &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,
+ {"inbox", "#mh/Mailbox/inbox", &tmp_ac_prefs.inbox, P_STRING,
&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},
&receive.filter_on_recv_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- /* selective download */
- {"sd_filter_on_receive", "TRUE", &tmp_ac_prefs.sd_filter_on_recv, P_BOOL,
- &receive.sd_filter_on_recv_chkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"sd_remove_mail_on_download", "TRUE", &tmp_ac_prefs.sd_rmmail_on_download, P_BOOL,
- &receive.sd_rmmail_chkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
+ {"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,
&p_send.date_chkbtn,
{"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_STRING,
+ {"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_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
- &compose.sigpath_entry,
+ {"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", "~" G_DIR_SEPARATOR_S 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,
&compose.autoreplyto_entry,
prefs_set_data_from_entry, prefs_set_entry},
-#if USE_GPGME
/* 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},
+ {"default_encrypt_reply", "TRUE", &tmp_ac_prefs.default_encrypt_reply, P_BOOL,
+ &privacy.default_encrypt_reply_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"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,
+ {"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},
- {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
- &privacy.defaultkey_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
+ {"privacy_prefs", "", &privacy_prefs, P_STRING,
+ NULL, NULL, NULL},
+#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 */
+
+ {"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.sent_folder_entry,
prefs_set_data_from_entry, prefs_set_entry},
+ {"set_queue_folder", "FALSE", &tmp_ac_prefs.set_queue_folder, P_BOOL,
+ &advanced.queue_folder_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"queue_folder", NULL, &tmp_ac_prefs.queue_folder, P_STRING,
+ &advanced.queue_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},
{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 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,
- GdkEventKey *event,
+static void pop_bfr_smtp_tm_set_sens (GtkWidget *widget,
gpointer data);
-static void prefs_account_ok (void);
+
+static void prefs_account_edit_custom_header (void);
+
static gint prefs_account_apply (void);
-static void prefs_account_cancel (void);
+
+typedef struct AccountPage
+{
+ PrefsPage page;
+
+ GtkWidget *vbox;
+} AccountPage;
+
+static AccountPage account_page;
+
+static void privacy_system_activated(GtkMenuItem *menuitem)
+{
+ const gchar* system_id;
+ gboolean privacy_enabled = FALSE;
+
+ system_id = g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
+
+ privacy_enabled = strcmp(system_id, "");
+
+ gtk_widget_set_sensitive (privacy.default_encrypt_chkbtn, privacy_enabled);
+ gtk_widget_set_sensitive (privacy.default_encrypt_reply_chkbtn, privacy_enabled);
+ gtk_widget_set_sensitive (privacy.default_sign_chkbtn, privacy_enabled);
+ gtk_widget_set_sensitive (privacy.save_clear_text_chkbtn, privacy_enabled);
+}
+
+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);
+
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(privacy_system_activated),
+ NULL);
+
+ 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);
+
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(privacy_system_activated),
+ NULL);
+
+
+ }
+
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(privacy.default_privacy_system), menu);
+}
+
+static void create_widget_func(PrefsPage * _page,
+ GtkWindow * window,
+ gpointer data)
+{
+ AccountPage *page = (AccountPage *) _page;
+ PrefsAccount *ac_prefs = (PrefsAccount *) data;
+ GtkWidget *vbox;
+
+ vbox = gtk_vbox_new(FALSE, 6);
+ gtk_widget_show(vbox);
+
+ if (notebook == NULL)
+ prefs_account_create();
+ gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+
+ update_privacy_system_menu();
+
+ tmp_ac_prefs = *ac_prefs;
+
+ if (new_account) {
+ PrefsAccount *def_ac;
+ gchar *buf;
+
+ prefs_set_dialog_to_default(param);
+ buf = g_strdup_printf(_("Account%d"), ac_prefs->account_id);
+ gtk_entry_set_text(GTK_ENTRY(basic.acname_entry), buf);
+ g_free(buf);
+ def_ac = account_get_default();
+ if (def_ac) {
+ gtk_entry_set_text(GTK_ENTRY(basic.name_entry),
+ def_ac->name ? def_ac->name : "");
+ gtk_entry_set_text(GTK_ENTRY(basic.addr_entry),
+ def_ac->address ? def_ac->address : "");
+ 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);
+ } else
+ prefs_set_dialog(param);
+
+ pop_bfr_smtp_tm_set_sens (NULL, NULL);
+
+ page->vbox = vbox;
+
+ page->page.widget = vbox;
+}
+
+static void destroy_widget_func(PrefsPage *_page)
+{
+ AccountPage *page = (AccountPage *) _page;
+
+ gtk_container_remove(GTK_CONTAINER (page->vbox), notebook);
+}
+
+static gboolean can_close_func(PrefsPage *page_)
+{
+ return prefs_account_apply() >= 0;
+}
+
+static void save_func(PrefsPage * _page)
+{
+ if (prefs_account_apply() >= 0)
+ cancelled = FALSE;
+}
+
+void prefs_account_init()
+{
+ static gchar *path[2];
+
+ path[0] = _("Account");
+ path[2] = NULL;
+
+ account_page.page.path = path;
+ account_page.page.weight = 1000.0;
+ account_page.page.create_widget = create_widget_func;
+ account_page.page.destroy_widget = destroy_widget_func;
+ account_page.page.save_page = save_func;
+ account_page.page.can_close = can_close_func;
+
+ prefs_account_register_page((PrefsPage *) &account_page);
+}
+
+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();
+
+ ac_prefs->privacy_prefs = g_hash_table_new(g_str_hash, g_str_equal);
+
+ return ac_prefs;
+}
void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
{
const gchar *p = label;
+ gchar *rcpath;
gint id;
+ gchar **strv, **cur;
g_return_if_fail(ac_prefs != NULL);
g_return_if_fail(label != NULL);
memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
- prefs_read_config(param, label, ACCOUNT_RC);
+ tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
+
+ rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
+ prefs_read_config(param, label, rcpath, NULL);
+ g_free(rcpath);
+
*ac_prefs = tmp_ac_prefs;
- while (*p && !isdigit(*p)) p++;
+ while (*p && !g_ascii_isdigit(*p)) p++;
id = atoi(p);
if (id < 0) g_warning("wrong account id: %d\n", id);
ac_prefs->account_id = id;
+ 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;
+ }
+
+ if (privacy_prefs != NULL) {
+ strv = g_strsplit(privacy_prefs, ",", 0);
+ for (cur = strv; *cur != NULL; cur++) {
+ gchar *encvalue, *value;
+
+ encvalue = strchr(*cur, '=');
+ if (encvalue == NULL)
+ continue;
+ encvalue[0] = '\0';
+ encvalue++;
+
+ value = g_malloc0(strlen(encvalue));
+ if (base64_decode(value, encvalue, strlen(encvalue)) > 0)
+ g_hash_table_insert(ac_prefs->privacy_prefs, g_strdup(*cur), g_strdup(value));
+ g_free(value);
+ }
+ g_strfreev(strv);
+ g_free(privacy_prefs);
+ privacy_prefs = NULL;
+ }
+
prefs_custom_header_read_config(ac_prefs);
}
-void prefs_account_save_config(PrefsAccount *ac_prefs)
+static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_data)
{
- gchar *buf;
+ GString *str = (GString *) user_data;
+ gchar *encvalue;
+ gchar *value = (gchar *) _value;
- g_return_if_fail(ac_prefs != NULL);
+ if (str->len > 0)
+ g_string_append_c(str, ',');
- tmp_ac_prefs = *ac_prefs;
- buf = g_strdup_printf("Account: %d", ac_prefs->account_id);
- prefs_save_config(param, buf, ACCOUNT_RC);
+ encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
+ base64_encode(encvalue, (gchar *) value, strlen(value));
+ g_string_sprintfa(str, "%s=%s", (gchar *) key, encvalue);
+ g_free(encvalue);
}
-void prefs_account_save_config_all(GList *account_list)
+void prefs_account_write_config_all(GList *account_list)
{
GList *cur;
gchar *rcpath;
g_free(rcpath);
for (cur = account_list; cur != NULL; cur = cur->next) {
+ GString *str;
+
tmp_ac_prefs = *(PrefsAccount *)cur->data;
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);
+ tmp_ac_prefs.account_id) <= 0)
return;
- }
+
+ str = g_string_sized_new(32);
+ g_hash_table_foreach(tmp_ac_prefs.privacy_prefs, create_privacy_prefs, str);
+ privacy_prefs = str->str;
+ g_string_free(str, FALSE);
+
+ if (prefs_write_param(param, pfile->fp) < 0) {
+ g_warning("failed to write configuration to file\n");
+ prefs_file_close_revert(pfile);
+ g_free(privacy_prefs);
+ privacy_prefs = NULL;
+ return;
+ }
+ g_free(privacy_prefs);
+ privacy_prefs = NULL;
+
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");
+}
+
+static gboolean free_privacy_prefs(gpointer key, gpointer value, gpointer user_data)
+{
+ g_free(key);
+ g_free(value);
+
+ return TRUE;
}
void prefs_account_free(PrefsAccount *ac_prefs)
{
if (!ac_prefs) return;
+ g_hash_table_foreach_remove(ac_prefs->privacy_prefs, free_privacy_prefs, NULL);
+
tmp_ac_prefs = *ac_prefs;
prefs_free(param);
}
+const gchar *prefs_account_get_privacy_prefs(PrefsAccount *account, gchar *id)
+{
+ return g_hash_table_lookup(account->privacy_prefs, id);
+}
+
+void prefs_account_set_privacy_prefs(PrefsAccount *account, gchar *id, gchar *new_value)
+{
+ gchar *orig_key = NULL, *value;
+
+ if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *) &orig_key, (gpointer *) &value)) {
+ g_hash_table_remove(account->privacy_prefs, id);
+
+ g_free(orig_key);
+ g_free(value);
+ }
+
+ if (new_value != NULL)
+ g_hash_table_insert(account->privacy_prefs, g_strdup(id), g_strdup(new_value));
+}
+
static gint prefs_account_get_new_id(void)
{
GList *ac_list;
return last_id + 1;
}
+void destroy_dialog(gpointer data)
+{
+ PrefsAccount *ac_prefs = (PrefsAccount *) data;
+ if (!cancelled)
+ *ac_prefs = tmp_ac_prefs;
+
+ gtk_main_quit();
+}
+
PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
{
- gboolean new_account = FALSE;
+ gchar *title;
if (prefs_rc_is_readonly(ACCOUNT_RC))
return ac_prefs;
inc_lock();
- cancelled = FALSE;
+ cancelled = TRUE;
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;
- }
-
- if (!dialog.window) {
- prefs_account_create();
- }
-
- manage_window_set_transient(GTK_WINDOW(dialog.window));
- gtk_notebook_set_page(GTK_NOTEBOOK(dialog.notebook), 0);
- gtk_widget_grab_focus(dialog.ok_btn);
+ } else
+ new_account = FALSE;
- tmp_ac_prefs = *ac_prefs;
-
- if (new_account) {
- PrefsAccount *def_ac;
- gchar *buf;
+ if (new_account)
+ title = g_strdup (_("Preferences for new account"));
+ else
+ title = g_strdup_printf (_("%s - Account preferences"),
+ ac_prefs->account_name);
- prefs_set_dialog_to_default(param);
- buf = g_strdup_printf(_("Account%d"), ac_prefs->account_id);
- gtk_entry_set_text(GTK_ENTRY(basic.acname_entry), buf);
- g_free(buf);
- def_ac = account_get_default();
- if (def_ac) {
- gtk_entry_set_text(GTK_ENTRY(basic.name_entry),
- def_ac->name ? def_ac->name : "");
- gtk_entry_set_text(GTK_ENTRY(basic.addr_entry),
- def_ac->address ? def_ac->address : "");
- 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 {
- prefs_set_dialog(param);
- gtk_window_set_title(GTK_WINDOW(dialog.window),
- _("Account preferences"));
- 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);
- }
-
- gtk_widget_show(dialog.window);
+ prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog);
+ g_free(title);
gtk_main();
- gtk_widget_hide(dialog.window);
inc_unlock();
if (cancelled && new_account) {
- g_free(ac_prefs);
+ prefs_account_free(ac_prefs);
return NULL;
- } else {
- *ac_prefs = tmp_ac_prefs;
+ } else
return ac_prefs;
- }
}
static void prefs_account_create(void)
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);
- MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
-
- 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);
+ notebook = gtk_notebook_new ();
+ gtk_widget_show(notebook);
+ gtk_container_set_border_width (GTK_CONTAINER (notebook), 2);
+ /* GTK_WIDGET_UNSET_FLAGS (notebook, GTK_CAN_FOCUS); */
+ gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
+
+ gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook));
+
+ gtk_widget_ref(notebook);
+ /* create all widgets on notebook */
prefs_account_basic_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Basic"), page++);
+ SET_NOTEBOOK_LABEL(notebook, _("Basic"), page++);
prefs_account_receive_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Receive"), page++);
+ SET_NOTEBOOK_LABEL(notebook, _("Receive"), page++);
prefs_account_send_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
+ SET_NOTEBOOK_LABEL(notebook, _("Send"), page++);
prefs_account_compose_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
-#if USE_GPGME
+ SET_NOTEBOOK_LABEL(notebook, _("Compose"), page++);
prefs_account_privacy_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
-#endif /* USE_GPGME */
-#if USE_SSL
+ SET_NOTEBOOK_LABEL(notebook, _("Privacy"), page++);
+#if USE_OPENSSL
prefs_account_ssl_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("SSL"), page++);
-#endif /* USE_SSL */
+ SET_NOTEBOOK_LABEL(notebook, _("SSL"), page++);
+#endif /* USE_OPENSSL */
prefs_account_advanced_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Advanced"), page++);
+ SET_NOTEBOOK_LABEL(notebook, _("Advanced"), page++);
prefs_account_fix_size();
}
#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 *smtpserv_entry;
GtkWidget *nntpserv_entry;
GtkWidget *nntpauth_chkbtn;
+ GtkWidget *nntpauth_onconnect_chkbtn;
GtkWidget *localmbox_entry;
GtkWidget *mailcmd_chkbtn;
GtkWidget *mailcmd_entry;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
- gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_add (GTK_CONTAINER (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 (_("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 (_("Set as default"));
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);
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.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 *size_limit_entry;
GtkWidget *label;
GtkWidget *filter_on_recv_chkbtn;
- GtkWidget *sd_filter_on_recv_chkbtn;
- GtkWidget *sd_rmmail_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 *label_maxarticle;
+ GtkWidget *spinbtn_maxarticle;
+ GtkObject *spinbtn_maxarticle_adj;
+
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
- gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
PACK_FRAME (vbox1, frame1, _("POP3"));
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"));
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_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
leave_time_label = gtk_label_new (_("Remove after"));
gtk_widget_show (leave_time_label);
leave_time_entry = gtk_entry_new ();
gtk_widget_show (leave_time_entry);
- gtk_widget_set_usize (leave_time_entry, 64, -1);
+ 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"));
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_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
+ gtk_label_set_justify (GTK_LABEL (leave_time_label), GTK_JUSTIFY_LEFT);
+ gtkut_widget_set_small_font_size (leave_time_label);
gtk_widget_show (leave_time_label);
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
_("Download all messages on server"));
- PACK_CHECK_BUTTON (vbox2, sd_filter_on_recv_chkbtn,
- _("Use filtering rules with Selective Download"));
- PACK_CHECK_BUTTON (vbox2, sd_rmmail_chkbtn,
- _("Remove mail after downloading with Selective Download"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
size_limit_entry = gtk_entry_new ();
gtk_widget_show (size_limit_entry);
- gtk_widget_set_usize (size_limit_entry, 64, -1);
+ 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");
+ 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_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
- _("Filter messages on receiving"));
-
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
hbox1 = gtk_hbox_new (FALSE, 8);
inbox_entry = gtk_entry_new ();
gtk_widget_show (inbox_entry);
- gtk_widget_set_usize (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
+ 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);
- gtk_signal_connect (GTK_OBJECT (inbox_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_account_select_folder_cb),
- inbox_entry);
+ g_signal_connect (G_OBJECT (inbox_btn), "clicked",
+ G_CALLBACK (prefs_account_select_folder_cb),
+ inbox_entry);
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
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);
+ gtkut_widget_set_small_font_size (label);
+
+ 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 (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);
+
+ label = gtk_label_new (_("Authentication method"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 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);
+
+ PACK_CHECK_BUTTON (vbox1, filter_on_recv_chkbtn,
+ _("Filter messages on receiving"));
PACK_CHECK_BUTTON
(vbox1, recvatgetall_chkbtn,
- _("`Get all' checks for new messages on this account"));
+ _("'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.sd_filter_on_recv_chkbtn = sd_filter_on_recv_chkbtn;
- receive.sd_rmmail_chkbtn = sd_rmmail_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 *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 (dialog.notebook), vbox1);
+ gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
PACK_FRAME (vbox1, frame, _("Header"));
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);
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);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new (_("Authentication method"));
gtk_widget_show (label);
optmenu_menu = gtk_menu_new ();
MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
+ MENUITEM_ADD (optmenu_menu, menuitem, "PLAIN", SMTPAUTH_PLAIN);
MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", SMTPAUTH_LOGIN);
MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
MENUITEM_ADD (optmenu_menu, menuitem, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
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);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new (_("User ID"));
gtk_widget_show (label);
smtp_uid_entry = gtk_entry_new ();
gtk_widget_show (smtp_uid_entry);
- gtk_widget_set_usize (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+ 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"));
smtp_pass_entry = gtk_entry_new ();
gtk_widget_show (smtp_pass_entry);
- gtk_widget_set_usize (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+ 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);
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);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new
- (_("If you leave these entries empty, the same\n"
+ (_("If you leave these entries empty, the same "
"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);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtkut_widget_set_small_font_size (label);
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_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 *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;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
- gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_add (GTK_CONTAINER (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"));
+
+ 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);
- sigpath_entry = gtk_entry_new ();
- gtk_widget_show (sigpath_entry);
- gtk_box_pack_start (GTK_BOX (hbox), sigpath_entry, TRUE, TRUE, 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"));
SET_TOGGLE_SENSITIVITY (autoreplyto_chkbtn, autoreplyto_entry);
- 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.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 *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_encrypt_reply_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *ascii_armored_chkbtn;
- GtkWidget *clearsign_chkbtn;
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
+ 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_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 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, 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, frame1, _("Sign key"));
-
- 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));
-
- 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);
- 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);
+ label = gtk_label_new(_("Default privacy system"));
+ 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);
- SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
+ PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
+ _("Encrypt message by default"));
+ PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_chkbtn,
+ _("Encrypt message by default when replying to an "
+ "encrypted message"));
+ 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_encrypt_reply_chkbtn = default_encrypt_reply_chkbtn;
privacy.default_sign_chkbtn = default_sign_chkbtn;
- privacy.ascii_armored_chkbtn = ascii_armored_chkbtn;
- privacy.clearsign_chkbtn = clearsign_chkbtn;
- privacy.defaultkey_radiobtn = defaultkey_radiobtn;
- privacy.emailkey_radiobtn = emailkey_radiobtn;
- privacy.customkey_radiobtn = customkey_radiobtn;
- privacy.customkey_entry = customkey_entry;
+ privacy.save_clear_text_chkbtn = save_clear_text_chkbtn;
}
-#endif /* USE_GPGME */
-#if USE_SSL
+#if USE_OPENSSL
#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data) \
{ \
(GTK_RADIO_BUTTON (btn_p), label); \
gtk_widget_show (btn); \
gtk_box_pack_start (GTK_BOX (box), btn, FALSE, FALSE, 0); \
- gtk_object_set_user_data (GTK_OBJECT (btn), \
- GINT_TO_POINTER (data)); \
+ g_object_set_data (G_OBJECT (btn), \
+ MENU_VAL_ID, \
+ GINT_TO_POINTER (data)); \
}
#define CREATE_RADIO_BUTTONS(box, \
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); \
- gtk_object_set_user_data (GTK_OBJECT (btn1), \
- GINT_TO_POINTER (btn1_data)); \
+ 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); \
GtkWidget *smtp_ssltunnel_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_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
PACK_FRAME (vbox1, pop_frame, _("POP3"));
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 (nntp_nossl_radiobtn),
- GINT_TO_POINTER (SSL_NONE));
+ g_object_set_data (G_OBJECT (nntp_nossl_radiobtn),
+ MENU_VAL_ID,
+ GINT_TO_POINTER (SSL_NONE));
CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
_("Use SSL for NNTP connection"), SSL_TUNNEL);
CREATE_RADIO_BUTTONS(vbox5,
smtp_nossl_radiobtn,
- _("Don't use SSL"),
+ _("Don't use SSL (but, if necessary, use STARTTLS)"),
SSL_NONE,
smtp_ssltunnel_radiobtn,
_("Use SSL for SMTP connection"),
_("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);
+ gtkut_widget_set_small_font_size (label);
+
ssl.pop_frame = pop_frame;
ssl.pop_nossl_radiobtn = pop_nossl_radiobtn;
ssl.pop_ssltunnel_radiobtn = pop_ssltunnel_radiobtn;
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_SSL */
+#endif /* USE_OPENSSL */
static void crosspost_color_toggled(void)
{
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
- (gtk_object_get_data(GTK_OBJECT(menuitem), "color"));
+ (g_object_get_data(G_OBJECT(menuitem), "color"));
}
static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
GtkWidget *entry_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
- GtkWidget *checkbtn_tunnelcmd;
- GtkWidget *entry_tunnelcmd;
- GtkWidget *checkbtn_crosspost;
+ GtkWidget *checkbtn_crosspost;
GtkWidget *colormenu_crosspost;
GtkWidget *menu;
- GtkWidget *imap_frame;
- GtkWidget *imapdir_label;
+ 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 *queue_folder_chkbtn;
+ GtkWidget *queue_folder_entry;
GtkWidget *draft_folder_chkbtn;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_chkbtn;
#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_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW_2);
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_tunnelcmd,
- _("Tunnel command to open connection"));
+ _("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);
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost,
_("Mark cross-posted messages as read and color:"));
- gtk_signal_connect (GTK_OBJECT (checkbtn_crosspost), "toggled",
- GTK_SIGNAL_FUNC (crosspost_color_toggled),
- NULL);
+ 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_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
- PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
-
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
-
+ 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);
gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
- table = gtk_table_new (3, 3, FALSE);
+ table = gtk_table_new (4, 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_widget_show (button); \
gtk_table_attach (GTK_TABLE (table), button, \
2, 3, n, n + 1, GTK_FILL, 0, 0, 0); \
- gtk_signal_connect \
- (GTK_OBJECT (button), "clicked", \
- GTK_SIGNAL_FUNC (prefs_account_select_folder_cb), \
+ g_signal_connect \
+ (G_OBJECT (button), "clicked", \
+ G_CALLBACK (prefs_account_select_folder_cb), \
entry); \
\
SET_TOGGLE_SENSITIVITY (chkbtn, entry); \
SET_CHECK_BTN_AND_ENTRY(_("Put sent messages in"),
sent_folder_chkbtn, sent_folder_entry, 0);
+ SET_CHECK_BTN_AND_ENTRY(_("Put queued messages in"),
+ queue_folder_chkbtn, queue_folder_entry, 1);
SET_CHECK_BTN_AND_ENTRY(_("Put draft messages in"),
- draft_folder_chkbtn, draft_folder_entry, 1);
+ draft_folder_chkbtn, draft_folder_entry, 2);
SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages in"),
- trash_folder_chkbtn, trash_folder_entry, 2);
+ trash_folder_chkbtn, trash_folder_entry, 3);
advanced.smtpport_chkbtn = checkbtn_smtpport;
advanced.smtpport_entry = entry_smtpport;
advanced.nntpport_entry = entry_nntpport;
advanced.domain_chkbtn = checkbtn_domain;
advanced.domain_entry = entry_domain;
- advanced.tunnelcmd_chkbtn = checkbtn_tunnelcmd;
- advanced.tunnelcmd_entry = entry_tunnelcmd;
advanced.crosspost_chkbtn = checkbtn_crosspost;
advanced.crosspost_colormenu = colormenu_crosspost;
- advanced.imap_frame = imap_frame;
+ 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.queue_folder_chkbtn = queue_folder_chkbtn;
+ advanced.queue_folder_entry = queue_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,
- gpointer data)
-{
- prefs_account_cancel();
- return TRUE;
-}
-
-static void prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_Escape)
- prefs_account_cancel();
-}
-
-static void prefs_account_ok(void)
-{
- if (prefs_account_apply() == 0)
- gtk_main_quit();
-}
-
static gint prefs_account_apply(void)
{
RecvProtocol protocol;
GtkWidget *menu;
GtkWidget *menuitem;
-
+ gchar *old_id = NULL;
+ gchar *new_id = NULL;
+
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."));
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_IMAP4) &&
+ 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;
alertpanel_error(_("mail command is not entered."));
return -1;
}
-
+
+ if (protocol == A_IMAP4 || protocol == A_NNTP)
+ old_id = g_strdup_printf("#%s/%s",
+ protocol == A_IMAP4 ? "imap":"nntp",
+ tmp_ac_prefs.account_name);
+
prefs_set_data_from_dialog(param);
+
+ if (protocol == A_IMAP4 || protocol == A_NNTP) {
+ new_id = g_strdup_printf("#%s/%s",
+ protocol == A_IMAP4 ? "imap":"nntp",
+ tmp_ac_prefs.account_name);
+ if (old_id != NULL && new_id != NULL)
+ prefs_filtering_rename_path(old_id, new_id);
+ g_free(old_id);
+ g_free(new_id);
+ }
return 0;
}
-static void prefs_account_cancel(void)
+static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
{
- cancelled = TRUE;
- gtk_main_quit();
+ 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)
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 || USE_SSL */
-
-#if USE_GPGME
-static void prefs_account_ascii_armored_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"
- "RFC 3156 - MIME Security with OpenPGP."));
-}
-#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;
- GList *children;
- gint list_order[] = {
- 0, /* A_POP3 */
- 1, /* A_APOP */
- -1, /* A_RPOP */
- 2, /* A_IMAP4 */
- 3, /* A_NNTP */
- 4 /* A_LOCAL */
- };
+ gint index;
protocol = *((RecvProtocol *)pparam->data);
- if (protocol < 0 || protocol > A_LOCAL) return;
- if (list_order[protocol] < 0) return;
- gtk_option_menu_set_history(optmenu, list_order[protocol]);
+ index = menu_find_option_menu_index
+ (optmenu, GINT_TO_POINTER(protocol), NULL);
+ if (index < 0) return;
+ gtk_option_menu_set_history(optmenu, index);
menu = gtk_option_menu_get_menu(optmenu);
menu_set_insensitive_all(GTK_MENU_SHELL(menu));
-#define SET_NTH_SENSITIVE(proto) \
-{ \
- menuitem = g_list_nth_data(children, list_order[proto]); \
- if (menuitem) \
- gtk_widget_set_sensitive(menuitem, TRUE); \
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_widget_set_sensitive(menuitem, TRUE);
+ gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
- children = GTK_MENU_SHELL(menu)->children;
- SET_NTH_SENSITIVE(protocol);
- if (protocol == A_POP3) {
- SET_NTH_SENSITIVE(A_APOP);
- } else if (protocol == A_APOP) {
- SET_NTH_SENSITIVE(A_POP3);
- }
+static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
-#undef SET_NTH_SENSITIVE
+ 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 IMAP_AUTH_CRAM_MD5:
+ gtk_option_menu_set_history(optmenu, 2);
+ break;
+ case 0:
+ default:
+ gtk_option_menu_set_history(optmenu, 0);
+ }
+
+ menu = gtk_option_menu_get_menu(optmenu);
menuitem = gtk_menu_get_active(GTK_MENU(menu));
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
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_smtp_auth_type_set_optmenu(PrefParam *pparam)
GtkWidget *menuitem;
switch (type) {
- case SMTPAUTH_LOGIN:
+ case SMTPAUTH_PLAIN:
gtk_option_menu_set_history(optmenu, 1);
break;
- case SMTPAUTH_CRAM_MD5:
+ case SMTPAUTH_LOGIN:
gtk_option_menu_set_history(optmenu, 2);
break;
- case SMTPAUTH_DIGEST_MD5:
+ case SMTPAUTH_CRAM_MD5:
gtk_option_menu_set_history(optmenu, 3);
break;
+ case SMTPAUTH_DIGEST_MD5:
+ gtk_option_menu_set_history(optmenu, 4);
+ break;
case 0:
default:
gtk_option_menu_set_history(optmenu, 0);
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;
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_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_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_SSL
+#if USE_OPENSSL
gtk_widget_hide(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_show(ssl.nntp_frame);
gtk_widget_show(advanced.nntpport_hbox);
gtk_widget_show(advanced.crosspost_chkbtn);
gtk_widget_show(advanced.crosspost_colormenu);
- gtk_widget_hide(advanced.imap_frame);
+ 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_hide(basic.nntpserv_label);
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.recvatgetall_chkbtn, 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);
+ /* 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_SSL
+#if USE_OPENSSL
gtk_widget_hide(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_hide(ssl.nntp_frame);
gtk_widget_hide(advanced.nntpport_hbox);
gtk_widget_hide(advanced.crosspost_chkbtn);
gtk_widget_hide(advanced.crosspost_colormenu);
- gtk_widget_hide(advanced.imap_frame);
+ 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_hide(basic.nntpserv_label);
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_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);
+ /* 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_SSL
+#if USE_OPENSSL
gtk_widget_hide(ssl.pop_frame);
gtk_widget_show(ssl.imap_frame);
gtk_widget_hide(ssl.nntp_frame);
gtk_widget_hide(advanced.nntpport_hbox);
gtk_widget_hide(advanced.crosspost_chkbtn);
gtk_widget_hide(advanced.crosspost_colormenu);
- gtk_widget_show(advanced.imap_frame);
+ 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:
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_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);
+ /* 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_SSL
+#if USE_OPENSSL
gtk_widget_show(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_hide(ssl.nntp_frame);
gtk_widget_hide(advanced.nntpport_hbox);
gtk_widget_hide(advanced.crosspost_chkbtn);
gtk_widget_hide(advanced.crosspost_colormenu);
- gtk_widget_hide(advanced.imap_frame);
+ 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,
gtk_widget_set_sensitive(basic.uid_entry, !use_mailcmd);
gtk_widget_set_sensitive(basic.pass_entry, !use_mailcmd);
}
+
+void prefs_account_register_page(PrefsPage *page)
+{
+ prefs_pages = g_slist_append(prefs_pages, page);
+}
+
+void prefs_account_unregister_page(PrefsPage *page)
+{
+ prefs_pages = g_slist_remove(prefs_pages, page);
+}
projects / claws.git / blobdiff