projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2009-03-30 [colin] 3.7.1cvs30
[claws.git] / src / prefs_account.c
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 4f17d82c8bb12086eee125af925fe87c6696560b..ef66c446db1831295ee697a16916f061f4551ceb 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-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -72,7 +72,7 @@ static GtkWidget *entry_sigpath;
 static GtkWidget *signature_browse_button;
 static GtkWidget *signature_edit_button;
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static GtkWidget *entry_in_cert_file;
 static GtkWidget *entry_out_cert_file;
 static GtkWidget *in_ssl_cert_browse_button;
@@ -148,6 +148,7 @@ typedef struct ReceivePage
        GtkWidget *imapdir_entry;
        GtkWidget *subsonly_checkbtn;
        GtkWidget *low_bandwidth_checkbtn;
+       GtkWidget *imap_use_trash_checkbtn;
 
        GtkWidget *frame_maxarticle;
        GtkWidget *maxarticle_label;
@@ -305,7 +306,7 @@ static SendPage send_page;
 static ComposePage compose_page;
 static TemplatesPage templates_page;
 static PrivacyPage privacy_page;
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static SSLPage ssl_page;
 #endif
 static AdvancedPage advanced_page;
@@ -490,6 +491,10 @@ static PrefParam receive_param[] = {
         &receive_page.low_bandwidth_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"imap_use_trash", "TRUE", &tmp_ac_prefs.imap_use_trash, P_BOOL,
+        &receive_page.imap_use_trash_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -680,7 +685,7 @@ static PrefParam privacy_param[] = {
 };
 
 static PrefParam ssl_param[] = {
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
        {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
         &ssl_page.pop_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
@@ -743,7 +748,7 @@ static PrefParam ssl_param[] = {
 
        {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
         NULL, NULL, NULL},
-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -850,7 +855,7 @@ static void prefs_account_sigcmd_radiobtn_cb        (GtkWidget      *widget,
 
 static void prefs_account_signature_browse_cb  (GtkWidget      *widget,
                                                 gpointer        data);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static void prefs_account_in_cert_browse_cb    (GtkWidget      *widget,
                                                 gpointer        data);
 
@@ -1354,6 +1359,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        GtkWidget *imapdir_entry;
        GtkWidget *subsonly_checkbtn;
        GtkWidget *low_bandwidth_checkbtn;
+       GtkWidget *imap_use_trash_checkbtn;
        GtkWidget *local_frame;
        GtkWidget *local_vbox;
        GtkWidget *local_hbox;
@@ -1504,7 +1510,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
 
        maxarticle_spinbtn_adj =
-               gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
+               gtk_adjustment_new (300, 0, 10000, 10, 100, 0);
        maxarticle_spinbtn = gtk_spin_button_new
                (GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
        gtk_widget_show (maxarticle_spinbtn);
@@ -1572,6 +1578,15 @@ static void receive_create_widget_func(PrefsPage * _page,
        CLAWS_SET_TIP(low_bandwidth_checkbtn,
                             _("This mode uses less bandwidth, but can be slower with some servers."));
 
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
+
+       PACK_CHECK_BUTTON (hbox1, imap_use_trash_checkbtn,
+                          _("Move deleted mails to trash and expunge immediately"));
+       CLAWS_SET_TIP(imap_use_trash_checkbtn,
+                            _("Moves deleted mails to trash instead of using the \\Deleted flag without expunging. "));
+
        PACK_CHECK_BUTTON (vbox1, filter_on_recv_checkbtn,
                           _("Filter messages on receiving"));
 
@@ -1603,9 +1618,10 @@ static void receive_create_widget_func(PrefsPage * _page,
        page->imap_auth_type_optmenu   = optmenu;
 
        page->imapdir_label             = imapdir_label;
-       page->imapdir_entry           = imapdir_entry;
+       page->imapdir_entry             = imapdir_entry;
        page->subsonly_checkbtn         = subsonly_checkbtn;
-       page->low_bandwidth_checkbtn            = low_bandwidth_checkbtn;
+       page->low_bandwidth_checkbtn    = low_bandwidth_checkbtn;
+       page->imap_use_trash_checkbtn   = imap_use_trash_checkbtn;
        page->local_frame               = local_frame;
        page->local_inbox_label = local_inbox_label;
        page->local_inbox_entry = local_inbox_entry;
@@ -2248,7 +2264,7 @@ static void privacy_create_widget_func(PrefsPage * _page,
        page->page.widget = vbox1;
 }
        
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 
 #define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)              \
 {                                                                      \
@@ -2498,7 +2514,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
 
 #undef CREATE_RADIO_BUTTONS
 #undef CREATE_RADIO_BUTTON
-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */
        
 static void advanced_create_widget_func(PrefsPage * _page,
                                            GtkWindow * window,
@@ -2856,7 +2872,7 @@ static gint prefs_privacy_apply(void)
        return 0;
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static gint prefs_ssl_apply(void)
 {
        prefs_set_data_from_dialog(ssl_param);
@@ -2900,7 +2916,7 @@ static void privacy_destroy_widget_func(PrefsPage *_page)
        /* PrivacyPage *page = (PrivacyPage *) _page; */
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static void ssl_destroy_widget_func(PrefsPage *_page)
 {
        /* SSLPage *page = (SSLPage *) _page; */
@@ -2972,7 +2988,7 @@ static gboolean privacy_can_close_func(PrefsPage *_page)
        return prefs_privacy_apply() >= 0;
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static gboolean ssl_can_close_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;
@@ -3072,7 +3088,7 @@ static void privacy_save_func(PrefsPage *_page)
                cancelled = FALSE;
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static void ssl_save_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;
@@ -3204,7 +3220,7 @@ static void register_privacy_page(void)
        prefs_account_register_page((PrefsPage *) &privacy_page);
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static void register_ssl_page(void)
 {
        static gchar *path[3];
@@ -3313,7 +3329,7 @@ void prefs_account_init()
        register_compose_page();
        register_templates_page();
        register_privacy_page();
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
        register_ssl_page();
        hooks_register_hook(SSLCERT_GET_CLIENT_CERT_HOOKLIST, sslcert_get_client_cert_hook, NULL);
        hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);
@@ -3350,8 +3366,8 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        gint id;
        gchar **strv, **cur;
 
-       g_return_if_fail(ac_prefs != NULL);
-       g_return_if_fail(label != NULL);
+       cm_return_if_fail(ac_prefs != NULL);
+       cm_return_if_fail(label != NULL);
 
        memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
        tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
@@ -3587,8 +3603,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs, gboolean *dirty)
 
        prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
                        &prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height,
-                       TRUE, TRUE,
-                       NULL, NULL);
+                       TRUE, NULL, NULL);
        g_free(title);
        gtk_main();
 
@@ -3690,7 +3705,7 @@ static void prefs_account_signature_browse_cb(GtkWidget *widget, gpointer data)
        g_free(utf8_filename);
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 static void prefs_account_in_cert_browse_cb(GtkWidget *widget, gpointer data)
 {
        gchar *filename;
@@ -3871,10 +3886,10 @@ static void prefs_account_set_string_from_combobox(PrefParam *pparam)
        GtkTreeIter iter;
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        combobox = *pparam->widget;
-       g_return_if_fail(gtk_combo_box_get_active_iter(
+       cm_return_if_fail(gtk_combo_box_get_active_iter(
                                GTK_COMBO_BOX(combobox), &iter));
 
        str = (gchar **)pparam->data;
@@ -3924,7 +3939,7 @@ static void prefs_account_set_privacy_combobox_from_string(PrefParam *pparam)
        gchar *prefsid;
        PrivacySystemSetCtx *ctx = NULL;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        prefsid = *((gchar **) pparam->data);
        if (prefsid == NULL)
@@ -4055,7 +4070,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 FALSE);
                }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_show(ssl_page.nntp_frame);
@@ -4074,6 +4089,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(receive_page.imapdir_entry);
                gtk_widget_hide(receive_page.subsonly_checkbtn);
                gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
+               gtk_widget_hide(receive_page.imap_use_trash_checkbtn);
                break;
        case A_LOCAL:
                gtk_widget_show(send_page.msgid_checkbtn);
@@ -4149,7 +4165,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 TRUE);
                }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -4168,6 +4184,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(receive_page.imapdir_entry);
                gtk_widget_hide(receive_page.subsonly_checkbtn);
                gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
+               gtk_widget_hide(receive_page.imap_use_trash_checkbtn);
                break;
        case A_IMAP4:
 #ifndef HAVE_LIBETPAN
@@ -4252,7 +4269,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 FALSE);
                }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_show(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -4271,6 +4288,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_show(receive_page.imapdir_entry);
                gtk_widget_show(receive_page.subsonly_checkbtn);
                gtk_widget_show(receive_page.low_bandwidth_checkbtn);
+               gtk_widget_show(receive_page.imap_use_trash_checkbtn);
                break;
        case A_NONE:
                gtk_widget_show(send_page.msgid_checkbtn);
@@ -4344,7 +4362,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_toggle_button_set_active
                        (GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn), FALSE);
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -4363,6 +4381,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(receive_page.imapdir_entry);
                gtk_widget_hide(receive_page.subsonly_checkbtn);
                gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
+               gtk_widget_hide(receive_page.imap_use_trash_checkbtn);
                break;
        case A_POP3:
        default:
@@ -4442,7 +4461,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 TRUE);
                }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                gtk_widget_show(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -4461,6 +4480,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(receive_page.imapdir_entry);
                gtk_widget_hide(receive_page.subsonly_checkbtn);
                gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
+               gtk_widget_hide(receive_page.imap_use_trash_checkbtn);
                break;
        }
 
@@ -4513,7 +4533,7 @@ static void prefs_account_compose_default_dictionary_set_string_from_optmenu
        GtkWidget *combo;
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        combo = *pparam->widget;
        str = (gchar **) pparam->data;
@@ -4528,23 +4548,31 @@ static void prefs_account_compose_default_dictionary_set_optmenu_from_string
        GtkWidget *combo;
        gchar *dictionary;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        dictionary = *((gchar **) pparam->data);
-       if (dictionary == NULL)
-               return;
-
-       if (strrchr(dictionary, '/')) {
-               dictionary = g_strdup(strrchr(dictionary, '/')+1);
-       }
+       if (dictionary != NULL) {
+               if (strrchr(dictionary, '/')) {
+                       dictionary = g_strdup(strrchr(dictionary, '/')+1);
+               }
 
-       if (strchr(dictionary, '-')) {
-               *(strchr(dictionary, '-')) = '\0';
+               if (strchr(dictionary, '-')) {
+                       *(strchr(dictionary, '-')) = '\0';
+               }
        }
        combo = *pparam->widget;
-       if (dictionary)
+       if (dictionary && *dictionary)
                gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo), 
                                                          dictionary);
+       else {
+               GtkTreeModel *model;
+               GtkTreeIter iter;
+               if((model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo))) == NULL)
+                       return;
+               if((gtk_tree_model_get_iter_first(model, &iter)) == FALSE)
+                       return;
+               gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
+       }
 }
 #endif
 
Claws Mail