2011-02-10 [paul] 3.7.8cvs49
authorPaul Mangan <paul@claws-mail.org>
Thu, 10 Feb 2011 16:02:44 +0000 (16:02 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 10 Feb 2011 16:02:44 +0000 (16:02 +0000)
* src/prefs_account.c
move the 'expunge immediately' option to a more
suitable page

ChangeLog
PATCHSETS
configure.ac
src/prefs_account.c

index bdd63bb..eca5950 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-10 [paul]      3.7.8cvs49
+
+       * src/prefs_account.c
+               move the 'expunge immediately' option to a more
+               suitable page
+
 2011-02-05 [pawel]     3.7.8cvs48
 
        * manual/advanced.xml
index b270b9e..3168b7e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.566 -r 1.382.2.567 src/compose.c;  cvs diff -u -r 1.204.2.199 -r 1.204.2.200 src/prefs_common.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/common/md5.c;  cvs diff -u -r 1.4.2.36 -r 1.4.2.37 src/common/ssl_certificate.c;  ) > 3.7.8cvs46.patchset
 ( cvs diff -u -r 1.75.2.67 -r 1.75.2.68 src/matcher.c;  cvs diff -u -r 1.49.2.137 -r 1.49.2.138 src/procmime.c;  cvs diff -u -r 1.17.2.24 -r 1.17.2.25 src/procmime.h;  cvs diff -u -r 1.15.2.59 -r 1.15.2.60 src/summary_search.c;  cvs diff -u -r 1.36.2.189 -r 1.36.2.190 src/common/utils.c;  cvs diff -u -r 1.20.2.74 -r 1.20.2.75 src/common/utils.h;  ) > 3.7.8cvs47.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 manual/advanced.xml;  cvs diff -u -r 1.213.2.198 -r 1.213.2.199 src/folder.c;  cvs diff -u -r 1.83.2.164 -r 1.83.2.165 src/mimeview.c;  cvs diff -u -r 1.204.2.200 -r 1.204.2.201 src/prefs_common.c;  cvs diff -u -r 1.103.2.131 -r 1.103.2.132 src/prefs_common.h;  ) > 3.7.8cvs48.patchset
+( cvs diff -u -r 1.105.2.162 -r 1.105.2.163 src/prefs_account.c;  ) > 3.7.8cvs49.patchset
index 69ac25a..650f6d3 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 2605725..81b3518 100644 (file)
@@ -148,7 +148,6 @@ typedef struct ReceivePage
        GtkWidget *imapdir_entry;
        GtkWidget *subsonly_checkbtn;
        GtkWidget *low_bandwidth_checkbtn;
-       GtkWidget *imap_use_trash_checkbtn;
 
        GtkWidget *frame_maxarticle;
        GtkWidget *maxarticle_label;
@@ -299,6 +298,7 @@ typedef struct AdvancedPage
        GtkWidget *draft_folder_entry;
        GtkWidget *trash_folder_checkbtn;
        GtkWidget *trash_folder_entry;
+       GtkWidget *imap_use_trash_checkbtn;
 } AdvancedPage;
 
 static BasicPage basic_page;
@@ -492,10 +492,6 @@ 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}
 };
 
@@ -843,6 +839,11 @@ static PrefParam advanced_param[] = {
        {"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
         &advanced_page.trash_folder_entry,
         prefs_set_data_from_entry, prefs_set_entry},
+        
+        {"imap_use_trash", "TRUE", &tmp_ac_prefs.imap_use_trash, P_BOOL,
+        &advanced_page.imap_use_trash_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -1354,7 +1355,6 @@ 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;
@@ -1578,11 +1578,6 @@ static void receive_create_widget_func(PrefsPage * _page,
        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"));
 
@@ -1617,7 +1612,6 @@ static void receive_create_widget_func(PrefsPage * _page,
        page->imapdir_entry             = imapdir_entry;
        page->subsonly_checkbtn         = subsonly_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;
@@ -2613,6 +2607,8 @@ static void advanced_create_widget_func(PrefsPage * _page,
        GtkWidget *draft_folder_entry;
        GtkWidget *trash_folder_checkbtn;
        GtkWidget *trash_folder_entry;
+       GtkWidget *imap_use_trash_checkbtn;
+
        CLAWS_TIP_DECL();
        GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 #define PACK_HBOX(hbox) \
@@ -2692,6 +2688,11 @@ static void advanced_create_widget_func(PrefsPage * _page,
        SET_TOGGLE_SENSITIVITY (checkbtn_tunnelcmd, entry_tunnelcmd);
 #endif
        PACK_HBOX (hbox1);
+       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 (hbox1, checkbtn_crosspost, 
                           _("Mark cross-posted messages as read and color:"));
        g_signal_connect (G_OBJECT (checkbtn_crosspost), "toggled",
@@ -2786,6 +2787,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
        page->draft_folder_entry  = draft_folder_entry;
        page->trash_folder_checkbtn = trash_folder_checkbtn;
        page->trash_folder_entry  = trash_folder_entry;
+       page->imap_use_trash_checkbtn = imap_use_trash_checkbtn;
 
        tmp_ac_prefs = *ac_prefs;
 
@@ -4141,11 +4143,11 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
 #endif
+               gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
                gtk_widget_hide(receive_page.imapdir_label);
                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);
@@ -4236,11 +4238,11 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
 #endif
+               gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
                gtk_widget_hide(receive_page.imapdir_label);
                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
@@ -4340,11 +4342,11 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_show(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_show(advanced_page.tunnelcmd_entry);
 #endif
+               gtk_widget_show(advanced_page.imap_use_trash_checkbtn);
                gtk_widget_show(receive_page.imapdir_label);
                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);
@@ -4433,11 +4435,11 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
 #endif
+               gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
                gtk_widget_hide(receive_page.imapdir_label);
                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:
@@ -4532,11 +4534,11 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
 #endif
+               gtk_widget_hide(advanced_page.imap_use_trash_checkbtn);
                gtk_widget_hide(receive_page.imapdir_label);
                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;
        }