raah forgot to update again

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index d07fdef2e429d3a5c5548ab0f9432ddaa0be0c79..e7a56568953a0d530e2b31b474ec5cf668ed8b3b 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -23,6 +23,8 @@
 
 #include "defs.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -32,7 +34,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
@@ -196,6 +197,8 @@ static struct Advanced {
 
        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;
@@ -286,7 +289,7 @@ static PrefParam param[] = {
        {"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 */
@@ -513,6 +516,13 @@ static PrefParam param[] = {
         &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},
@@ -570,6 +580,20 @@ typedef struct 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_sign_chkbtn, privacy_enabled);
+       gtk_widget_set_sensitive (privacy.save_clear_text_chkbtn, privacy_enabled);
+}
+
 void update_privacy_system_menu() {
        GtkWidget *menu;
        GtkWidget *menuitem;
@@ -582,6 +606,10 @@ void update_privacy_system_menu() {
        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;
@@ -592,6 +620,12 @@ void update_privacy_system_menu() {
                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);
@@ -657,6 +691,11 @@ static void destroy_widget_func(PrefsPage *_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)
@@ -675,6 +714,7 @@ void prefs_account_init()
        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);
 }
@@ -697,6 +737,7 @@ PrefsAccount *prefs_account_new(void)
 void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
 {
        const guchar *p = label;
+       gchar *rcpath;
        gint id;
        gchar **strv, **cur;
 
@@ -706,7 +747,10 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
        tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
 
-       prefs_read_config(param, label, ACCOUNT_RC);
+       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++;
        id = atoi(p);
@@ -1353,6 +1397,8 @@ static void prefs_account_receive_create(void)
        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);
 
@@ -1411,6 +1457,7 @@ static void prefs_account_receive_create(void)
        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"));
 
@@ -1632,11 +1679,13 @@ static void prefs_account_send_create(void)
        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);
 
@@ -2029,6 +2078,7 @@ static void prefs_account_ssl_create(void)
                (_("(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;
@@ -2120,6 +2170,8 @@ static void prefs_account_advanced_create(void)
        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;
@@ -2226,7 +2278,7 @@ static void prefs_account_advanced_create(void)
        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);
@@ -2262,10 +2314,12 @@ static void prefs_account_advanced_create(void)
 
        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;
@@ -2290,6 +2344,8 @@ static void prefs_account_advanced_create(void)
 
        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;
@@ -2502,12 +2558,15 @@ static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
        GtkWidget *menuitem;
 
        switch (type) {
-       case IMAP_AUTH_LOGIN:
+       case IMAP_AUTH_PLAIN:
                gtk_option_menu_set_history(optmenu, 1);
                break;
-       case IMAP_AUTH_CRAM_MD5:
+       case IMAP_AUTH_LOGIN:
                gtk_option_menu_set_history(optmenu, 2);
                break;
+       case IMAP_AUTH_CRAM_MD5:
+               gtk_option_menu_set_history(optmenu, 3);
+               break;
        case 0:
        default:
                gtk_option_menu_set_history(optmenu, 0);