2005-11-18 [colin] 1.9.100cvs22

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index de3ddb305863549808135903cfa6cc2f4fff74b9..484803da832b9eec4aa2affcf17f44e86b098bd5 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -14,7 +14,7 @@
  *
  * 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
@@ -27,6 +27,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/filesel.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -37,6 +38,7 @@
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
+#include "prefs_common.h"
 #include "prefs_customheader.h"
 #include "account.h"
 #include "mainwindow.h"
@@ -59,6 +61,10 @@ static gboolean new_account;
 static PrefsAccount tmp_ac_prefs;
 
 static GtkWidget *notebook;
+static GtkWidget *sigfile_radiobtn;
+static GtkWidget *sigcmd_radiobtn;
+static GtkWidget *entry_sigpath;
+static GtkWidget *signature_browse_button;
 
 static GSList *prefs_pages = NULL;
 
@@ -109,6 +115,8 @@ static struct Receive {
        
        GtkWidget *imap_frame;
        GtkWidget *imap_auth_type_optmenu;
+       GtkWidget *imapdir_label;
+       GtkWidget *imapdir_entry;
 
        GtkWidget *frame_maxarticle;
        GtkWidget *label_maxarticle;
@@ -193,8 +201,6 @@ static struct Advanced {
 
        GtkWidget *tunnelcmd_chkbtn;
        GtkWidget *tunnelcmd_entry;
-       GtkWidget *imapdir_label;
-       GtkWidget *imapdir_entry;
 
        GtkWidget *sent_folder_chkbtn;
        GtkWidget *sent_folder_entry;
@@ -450,6 +456,19 @@ static PrefParam param[] = {
        {"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 */
@@ -511,7 +530,7 @@ static PrefParam param[] = {
         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,
@@ -560,6 +579,15 @@ static void prefs_account_advanced_create  (void);
 static void prefs_account_select_folder_cb     (GtkWidget      *widget,
                                                 gpointer        data);
 
+static void prefs_account_sigfile_radiobtn_cb  (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void prefs_account_sigcmd_radiobtn_cb   (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void prefs_account_signature_browse_cb  (GtkWidget      *widget,
+                                                gpointer        data);
+
 static void pop_bfr_smtp_tm_set_sens           (GtkWidget      *widget,
                                                 gpointer        data);
 
@@ -936,7 +964,8 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
                title = g_strdup_printf (_("%s - Account preferences"),
                                ac_prefs->account_name);
 
-       prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog);
+       prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
+                       &prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height);
        g_free(title);
        gtk_main();
 
@@ -1170,14 +1199,14 @@ static void prefs_account_basic_create(void)
                (_("This server requires authentication"));
        gtk_widget_show (nntpauth_chkbtn);
        
-       gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 1, 2,
+       gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 6, 7,
                          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_table_attach (GTK_TABLE (serv_table), nntpauth_onconnect_chkbtn, 2, 4, 6, 7,
                          GTK_FILL, 0, 0, 0);
 
        recvserv_entry = gtk_entry_new ();
@@ -1329,6 +1358,9 @@ static void prefs_account_receive_create(void)
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;
        GtkWidget *imap_frame;
+       GtkWidget *imapdir_label;
+       GtkWidget *imapdir_entry;
+
        GtkWidget *optmenu;
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
@@ -1507,6 +1539,18 @@ static void prefs_account_receive_create(void)
 
        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"));
 
@@ -1529,6 +1573,9 @@ static void prefs_account_receive_create(void)
        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;
@@ -1738,12 +1785,9 @@ static void prefs_account_compose_create(void)
        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;
@@ -1792,6 +1836,8 @@ static void prefs_account_compose_create(void)
        g_object_set_data (G_OBJECT (sigfile_radiobtn),
                           MENU_VAL_ID,
                           GINT_TO_POINTER (SIG_FILE));
+       g_signal_connect(G_OBJECT(sigfile_radiobtn), "clicked",
+                        G_CALLBACK(prefs_account_sigfile_radiobtn_cb), NULL);
 
        sigcmd_radiobtn = gtk_radio_button_new_with_label_from_widget
                (GTK_RADIO_BUTTON(sigfile_radiobtn), _("Command output"));
@@ -1801,6 +1847,8 @@ static void prefs_account_compose_create(void)
        g_object_set_data (G_OBJECT (sigcmd_radiobtn),
                           MENU_VAL_ID,
                           GINT_TO_POINTER (SIG_COMMAND));
+       g_signal_connect(G_OBJECT(sigcmd_radiobtn), "clicked",
+                        G_CALLBACK(prefs_account_sigcmd_radiobtn_cb), NULL);
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);
@@ -1813,6 +1861,12 @@ static void prefs_account_compose_create(void)
        gtk_widget_show (entry_sigpath);
        gtk_box_pack_start (GTK_BOX (hbox2), entry_sigpath, TRUE, TRUE, 0);
 
+       signature_browse_button = gtkut_get_browse_file_btn(_("_Browse"));
+       gtk_widget_show (signature_browse_button);
+       gtk_box_pack_start (GTK_BOX (hbox2), signature_browse_button, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(signature_browse_button), "clicked",
+                        G_CALLBACK(prefs_account_signature_browse_cb), NULL);
+
        PACK_FRAME (vbox1, frame, _("Automatically set the following addresses"));
 
        table =  gtk_table_new (3, 2, FALSE);
@@ -2165,8 +2219,6 @@ static void prefs_account_advanced_create(void)
        GtkWidget *menu;
        GtkWidget *checkbtn_tunnelcmd;
        GtkWidget *entry_tunnelcmd;
-       GtkWidget *imapdir_label;
-       GtkWidget *imapdir_entry;
        GtkWidget *folder_frame;
        GtkWidget *vbox3;
        GtkWidget *table;
@@ -2260,14 +2312,6 @@ static void prefs_account_advanced_create(void)
        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
 
@@ -2341,8 +2385,6 @@ static void prefs_account_advanced_create(void)
 
        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;
@@ -2418,7 +2460,7 @@ static gint prefs_account_apply(void)
        if (protocol == A_IMAP4 || protocol == A_NNTP) 
                old_id = g_strdup_printf("#%s/%s",
                                protocol == A_IMAP4 ? "imap":"nntp",
-                               tmp_ac_prefs.account_name);
+                               tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
        
        prefs_set_data_from_dialog(param);
        
@@ -2455,6 +2497,33 @@ static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void prefs_account_sigfile_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+       gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), TRUE);
+}
+
+static void prefs_account_sigcmd_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+       gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), FALSE);
+}
+
+static void prefs_account_signature_browse_cb(GtkWidget *widget, gpointer data)
+{
+       gchar *filename;
+       gchar *utf8_filename;
+
+       filename = filesel_select_file_open(_("Select signature file"), NULL);
+       if (!filename) return;
+
+       utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+       if (!utf8_filename) {
+               g_warning("prefs_account_signature_browse_cb(): failed to convert character set.");
+               utf8_filename = g_strdup(filename);
+       }
+       gtk_entry_set_text(GTK_ENTRY(entry_sigpath), utf8_filename);
+       g_free(utf8_filename);
+}
+
 static void prefs_account_edit_custom_header(void)
 {
        prefs_custom_header_open(&tmp_ac_prefs);
@@ -2732,6 +2801,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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
@@ -2740,6 +2810,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2758,8 +2831,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2806,6 +2879,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2817,6 +2891,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2835,8 +2912,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2886,6 +2963,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2897,6 +2975,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2915,8 +2996,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2967,6 +3048,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -2975,7 +3057,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                /* 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);
 
@@ -2992,8 +3076,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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:
@@ -3045,6 +3129,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -3055,6 +3140,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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);
@@ -3073,8 +3161,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                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;
        }