#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 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,
{"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 */
static gint prefs_account_apply (void);
static void prefs_account_cancel (void);
+typedef struct AccountPage
+{
+ PrefsPage page;
+
+ GtkWidget *vbox;
+} AccountPage;
+
+static AccountPage account_page;
+
+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);
+ gtk_object_set_data(GTK_OBJECT(menuitem), "user_data", "");
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+
+ system_ids = privacy_get_system_ids();
+ for (cur = system_ids; cur != NULL; cur = g_slist_next(cur)) {
+ gchar *id = (gchar *) cur->data;
+ const gchar *name;
+
+ name = privacy_system_get_name(id);
+ menuitem = gtk_menu_item_new_with_label(name);
+ gtk_widget_show(menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(menuitem), "user_data", id, g_free);
+ gtk_menu_append(GTK_MENU(menu), menuitem);
+ }
+
+ 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_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 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;
+
+ prefs_account_register_page((PrefsPage *) &account_page);
+}
+
PrefsAccount *prefs_account_new(void)
{
PrefsAccount *ac_prefs;
*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;
}
{
const guchar *p = label;
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));
+ tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
+
prefs_read_config(param, label, ACCOUNT_RC);
*ac_prefs = tmp_ac_prefs;
while (*p && !isdigit(*p)) p++;
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_sprintfa(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 *) &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 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);
- gtk_object_set_data(GTK_OBJECT(menuitem), "user_data", "");
- gtk_menu_append(GTK_MENU(menu), menuitem);
+void destroy_dialog(gpointer data)
+{
+ PrefsAccount *ac_prefs = (PrefsAccount *) data;
- 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);
- gtk_object_set_data_full(GTK_OBJECT(menuitem), "user_data", id, g_free);
- gtk_menu_append(GTK_MENU(menu), menuitem);
- }
+ if (!cancelled)
+ *ac_prefs = tmp_ac_prefs;
- gtk_option_menu_set_menu(GTK_OPTION_MENU(privacy.default_privacy_system), menu);
+ 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_page(GTK_NOTEBOOK(dialog.notebook), 0);
- gtk_widget_grab_focus(dialog.ok_btn);
-
- tmp_ac_prefs = *ac_prefs;
-
- update_privacy_system_menu();
+ } 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);
- 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++);
+ SET_NOTEBOOK_LABEL(notebook, _("Compose"), page++);
prefs_account_privacy_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
+ 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);
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"));
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"));
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"));
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);
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"));
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);
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_acount_unregister_page(PrefsPage *page)
+{
+ prefs_pages = g_slist_remove(prefs_pages, page);
+}
projects / claws.git / blobdiff