/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#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_gtk.h"
#include "prefs_account.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;
static struct Receive {
GtkWidget *pop3_frame;
+ GtkWidget *use_apop_chkbtn;
GtkWidget *rmmail_chkbtn;
GtkWidget *leave_time_entry;
GtkWidget *getall_chkbtn;
GtkWidget *imap_frame;
GtkWidget *imap_auth_type_optmenu;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_entry;
GtkWidget *frame_maxarticle;
GtkWidget *label_maxarticle;
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 *gnupg_mime_radiobtn;
- GtkWidget *gnupg_inline_radiobtn;
- GtkWidget *defaultkey_radiobtn;
- GtkWidget *emailkey_radiobtn;
- GtkWidget *customkey_radiobtn;
- GtkWidget *customkey_entry;
+ GtkWidget *save_clear_text_chkbtn;
} privacy;
-#endif /* USE_GPGME */
#if USE_OPENSSL
static struct SSLPrefs {
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_enum_set_data_from_radiobtn (PrefParam *pparam);
static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
-#if USE_GPGME
-static void prefs_account_gnupg_inline_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);
static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
gpointer user_data);
+static gchar *privacy_prefs;
+
static PrefParam param[] = {
/* Basic */
{"account_name", NULL, &tmp_ac_prefs.account_name, 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},
&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,
+ {"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.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},
- {"default_gnupg_mode", NULL, &tmp_ac_prefs.default_gnupg_mode, P_ENUM,
- &privacy.gnupg_mime_radiobtn,
- prefs_account_enum_set_data_from_radiobtn,
- prefs_account_enum_set_radiobtn},
- {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
- &privacy.defaultkey_radiobtn,
- prefs_account_enum_set_data_from_radiobtn,
- prefs_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 */
-
+ {"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},
+ {"privacy_prefs", "", &privacy_prefs, P_STRING,
+ NULL, NULL, NULL},
#if USE_OPENSSL
/* SSL */
{"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
{"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},
+#else
+ /* SSL */
+ {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
+ NULL, NULL, NULL},
+ {"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
+ NULL, NULL, NULL},
+ {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
+ NULL, NULL, NULL},
+ {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
+ NULL, NULL, NULL},
+
+ {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
+ NULL, NULL, NULL},
#endif /* USE_OPENSSL */
/* Advanced */
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},
+ &receive.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,
&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},
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_OPENSSL
static void prefs_account_ssl_create (void);
#endif /* USE_OPENSSL */
static void prefs_account_edit_custom_header (void);
-static gint prefs_account_deleted (GtkWidget *widget,
- GdkEventAny *event,
- gpointer data);
-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);
+
+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)
{
*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 guchar *p = 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);
}
+static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_data)
+{
+ GString *str = (GString *) user_data;
+ gchar *encvalue;
+ gchar *value = (gchar *) _value;
+
+ if (str->len > 0)
+ g_string_append_c(str, ',');
+
+ encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
+ base64_encode(encvalue, (gchar *) value, strlen(value));
+ g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
+ g_free(encvalue);
+}
+
void prefs_account_write_config_all(GList *account_list)
{
GList *cur;
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) {
+ 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);
- return;
- }
+ 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");
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 *)(gchar *) &orig_key, (gpointer *)(gchar *) &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 = prefs_account_new();
new_account = TRUE;
- }
-
- if (!dialog.window) {
- prefs_account_create();
- }
-
- manage_window_set_transient(GTK_WINDOW(dialog.window));
- gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
- gtk_widget_grab_focus(dialog.ok_btn);
-
- tmp_ac_prefs = *ac_prefs;
+ } else
+ new_account = FALSE;
- 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);
- 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);
+ if (new_account)
+ title = g_strdup (_("Preferences for new account"));
+ else
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);
- }
- pop_bfr_smtp_tm_set_sens (NULL, NULL);
-
- 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);
- 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);
+ 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 */
+ SET_NOTEBOOK_LABEL(notebook, _("Privacy"), page++);
#if USE_OPENSSL
prefs_account_ssl_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("SSL"), page++);
+ 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();
}
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);
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);
GtkWidget *vbox1;
GtkWidget *frame1;
GtkWidget *vbox2;
+ GtkWidget *use_apop_chkbtn;
GtkWidget *rmmail_chkbtn;
GtkWidget *hbox_spc;
GtkWidget *leave_time_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
GtkWidget *imap_frame;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_entry;
+
GtkWidget *optmenu;
GtkWidget *optmenu_menu;
GtkWidget *menuitem;
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"));
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);
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"));
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
+
+ imapdir_label = gtk_label_new (_("IMAP server directory (usually empty)"));
+ 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, FALSE, FALSE, 0);
+
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.imap_frame = imap_frame;
receive.imap_auth_type_optmenu = optmenu;
+ receive.imapdir_label = imapdir_label;
+ receive.imapdir_entry = imapdir_entry;
+
receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
receive.frame_maxarticle = frame2;
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"));
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);
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);
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_sig, _("Signature"));
compose.autoreplyto_entry = autoreplyto_entry;
}
-#if USE_GPGME
static void prefs_account_privacy_create(void)
{
GtkWidget *vbox1;
- GtkWidget *frame_mode;
- GtkWidget *vbox_mode;
- GtkWidget *frame1;
GtkWidget *vbox2;
GtkWidget *hbox1;
GtkWidget *label;
+ GtkWidget *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_encrypt_reply_chkbtn;
GtkWidget *default_sign_chkbtn;
- GtkWidget *gnupg_mime_radiobtn;
- GtkWidget *gnupg_inline_radiobtn;
- 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_FRAME (vbox1, frame_mode, _("Default mode"));
-
- vbox_mode = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_mode);
- gtk_container_add (GTK_CONTAINER (frame_mode), vbox_mode);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_mode), 8);
-
- gnupg_mime_radiobtn = gtk_radio_button_new_with_label
- (NULL, _("Use PGP/MIME"));
- gtk_widget_show (gnupg_mime_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_mime_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (gnupg_mime_radiobtn),
- GINT_TO_POINTER (GNUPG_MODE_DETACH));
-
- gnupg_inline_radiobtn = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON (gnupg_mime_radiobtn),
- _("Use Inline"));
- gtk_widget_show (gnupg_inline_radiobtn);
- gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_inline_radiobtn,
- FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (gnupg_inline_radiobtn),
- GINT_TO_POINTER (GNUPG_MODE_INLINE));
- g_signal_connect (G_OBJECT (gnupg_inline_radiobtn), "clicked",
- prefs_account_gnupg_inline_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);
- g_object_set_data (G_OBJECT (defaultkey_radiobtn),
- MENU_VAL_ID,
- 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);
- g_object_set_data (G_OBJECT (emailkey_radiobtn),
- MENU_VAL_ID,
- 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);
- g_object_set_data (G_OBJECT (customkey_radiobtn),
- MENU_VAL_ID,
- 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);
-
- label = gtk_label_new ("");
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_widget_set_size_request (label, 16, -1);
+ gtk_container_add (GTK_CONTAINER(vbox2), hbox1);
- 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.gnupg_mime_radiobtn = gnupg_mime_radiobtn;
- privacy.gnupg_inline_radiobtn = gnupg_inline_radiobtn;
- privacy.defaultkey_radiobtn = defaultkey_radiobtn;
- privacy.emailkey_radiobtn = emailkey_radiobtn;
- privacy.customkey_radiobtn = customkey_radiobtn;
- privacy.customkey_entry = customkey_entry;
+ privacy.save_clear_text_chkbtn = save_clear_text_chkbtn;
}
-#endif /* USE_GPGME */
#if USE_OPENSSL
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"));
(_("(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;
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 *queue_folder_chkbtn;
+ GtkWidget *queue_folder_entry;
GtkWidget *draft_folder_chkbtn;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_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, VSPACING_NARROW_2);
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
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);
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.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 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)
-{
- 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
return -1;
}
if (((protocol == A_POP3) ||
- (protocol == A_APOP) ||
(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)
-{
- cancelled = TRUE;
- 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,
}
}
-#if USE_GPGME
-static void prefs_account_gnupg_inline_warning(GtkWidget *widget)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) &&
- gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook)) > 0)
- alertpanel_warning
- (_("Its not recommended to use the old style Inline\n"
- "mode for GnuPG messages. It doesn't comply with\n"
- "RFC 3156 - MIME Security with OpenPGP."));
-}
-#endif /* USE_GPGME */
-
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
{
GtkWidget *menu;
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 */
- 5, /* A_NONE */
- };
+ gint index;
protocol = *((RecvProtocol *)pparam->data);
- if (protocol < 0 || protocol > A_NONE) 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); \
-}
-
- 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);
- }
-
-#undef SET_NTH_SENSITIVE
-
menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_widget_set_sensitive(menuitem, TRUE);
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
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;
gtk_widget_hide(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
gtk_widget_show(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
/* update pop_before_smtp sensitivity */
gtk_toggle_button_set_active
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.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
FALSE);
gtk_widget_hide(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_show(ssl.nntp_frame);
- gtk_widget_hide(ssl.send_frame);
+ gtk_widget_show(ssl.send_frame);
#endif
gtk_widget_hide(advanced.popport_hbox);
gtk_widget_hide(advanced.imapport_hbox);
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);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
case A_LOCAL:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
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.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
TRUE);
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);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
case A_IMAP4:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_show(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
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.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
FALSE);
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);
+ gtk_widget_show(receive.imapdir_label);
+ gtk_widget_show(receive.imapdir_entry);
break;
case A_NONE:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, FALSE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
gtk_widget_set_sensitive(basic.smtpserv_entry, 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.filter_on_recv_chkbtn), FALSE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
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);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
case A_POP3:
default:
gtk_widget_show(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
pop_bfr_smtp_tm_set_sens(NULL, NULL);
if (!tmp_ac_prefs.account_name) {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
TRUE);
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);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
}
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);
+}