2007-04-28 [colin] 2.9.1cvs33

	* src/account.c
	* src/pop.c
	* src/prefs_account.c
	* src/prefs_account.h
		Drop the "Download all" preference. It's
		stupidly useless and confuses people from
		time to time.

diff --git a/ChangeLog b/ChangeLog
index 929afa67719e1ace4b4f4f349e251fd960049350..e4133fbefe1c69160b12a77c273e07bfd4674f72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-28 [colin]     2.9.1cvs33
+
+       * src/account.c
+       * src/pop.c
+       * src/prefs_account.c
+       * src/prefs_account.h
+               Drop the "Download all" preference. It's
+               stupidly useless and confuses people from
+               time to time.
+
 2007-04-27 [wwp]       2.9.1cvs32
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index eefdc683518e6d08bae63598e79c4d68bcb1fe98..0c4d3ce85244f60471ddb99fc7802a3b9952deae 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2560,3 +2560,4 @@
 ( cvs diff -u -r 1.274.2.186 -r 1.274.2.187 src/mainwindow.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_logging.c;  ) > 2.9.1cvs30.patchset
 ( cvs diff -u -r 1.213.2.142 -r 1.213.2.143 src/folder.c;  cvs diff -u -r 1.179.2.170 -r 1.179.2.171 src/imap.c;  cvs diff -u -r 1.105.2.92 -r 1.105.2.93 src/prefs_account.c;  cvs diff -u -r 1.49.2.25 -r 1.49.2.26 src/prefs_account.h;  cvs diff -u -r 1.1.4.78 -r 1.1.4.79 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/etpan/imap-thread.h;  ) > 2.9.1cvs31.patchset
 ( cvs diff -u -r 1.61.2.61 -r 1.61.2.62 src/account.c;  cvs diff -u -r 1.105.2.93 -r 1.105.2.94 src/prefs_account.c;  cvs diff -u -r 1.49.2.26 -r 1.49.2.27 src/prefs_account.h;  ) > 2.9.1cvs32.patchset
+( cvs diff -u -r 1.61.2.62 -r 1.61.2.63 src/account.c;  cvs diff -u -r 1.56.2.51 -r 1.56.2.52 src/pop.c;  cvs diff -u -r 1.105.2.94 -r 1.105.2.95 src/prefs_account.c;  cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/prefs_account.h;  ) > 2.9.1cvs33.patchset

diff --git a/configure.ac b/configure.ac
index 082a0637495377ea3fd008b9282dd4288115b5c4..6baefd156ca024599293509dd94dd48c73731519 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index 1a8bb8b902d345a29ab58d580284a37e6a89381d..6730bf4ab6d6acf0038a9d0dee13cb0f35697510 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -923,7 +923,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
        /* receive */
        ACP_FASSIGN(rmmail);
        ACP_FASSIGN(msg_leave_time);
-       ACP_FASSIGN(getall);
        ACP_FASSIGN(recv_at_getall);
        ACP_FASSIGN(sd_rmmail_on_download);
        ACP_FASSIGN(sd_filter_on_recv);

diff --git a/src/pop.c b/src/pop.c
index da84d5e6baaf270d1124ffa923818e0019802f5e..26ec5313f6682f256b66b5604beca1e4f29c767b 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -277,7 +277,7 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
                partial_recv = (gint)g_hash_table_lookup(
                                        session->partial_recv_table, id);
 
-               if ((!session->ac_prefs->getall && recv_time != RECV_TIME_NONE)
+               if (recv_time != RECV_TIME_NONE
                || partial_recv != POP3_TOTALLY_RECEIVED) {
                        session->msg[num].received = 
                                (partial_recv != POP3_MUST_COMPLETE_RECV);
@@ -286,7 +286,7 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
                                session->new_msg_exist = TRUE;
                }
                if (!session->new_msg_exist &&
-                   (session->ac_prefs->getall || recv_time == RECV_TIME_NONE ||
+                   (recv_time == RECV_TIME_NONE ||
                     session->ac_prefs->rmmail)) {
                        session->cur_msg = num;
                        session->new_msg_exist = TRUE;

diff --git a/src/prefs_account.c b/src/prefs_account.c
index aa436db06a9ed8e3073e733a9de9276bdf5bc378..2e8496d7d40a259482274d4d0834f0ac7509e72b 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -115,7 +115,6 @@ static struct Receive {
        GtkWidget *use_apop_checkbtn;
        GtkWidget *rmmail_checkbtn;
        GtkWidget *leave_time_entry;
-       GtkWidget *getall_checkbtn;
        GtkWidget *size_limit_checkbtn;
        GtkWidget *size_limit_entry;
        GtkWidget *inbox_label;
@@ -363,9 +362,6 @@ static PrefParam param[] = {
         &receive.leave_time_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 #endif
-       {"get_all_mail", "FALSE", &tmp_ac_prefs.getall, P_BOOL,
-        &receive.getall_checkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
         &receive.size_limit_checkbtn,
@@ -1486,7 +1482,6 @@ static void prefs_account_receive_create(void)
        GtkTooltips *leave_time_tooltip;
        GtkWidget *leave_time_label;
        GtkWidget *leave_time_entry;
-       GtkWidget *getall_checkbtn;
        GtkWidget *hbox1;
        GtkWidget *size_limit_checkbtn;
        GtkWidget *size_limit_entry;
@@ -1593,9 +1588,6 @@ static void prefs_account_receive_create(void)
 
        SET_TOGGLE_SENSITIVITY (rmmail_checkbtn, hbox1);
 
-       PACK_CHECK_BUTTON (vbox2, getall_checkbtn,
-                          _("Download all messages on server"));
-
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
@@ -1742,7 +1734,6 @@ static void prefs_account_receive_create(void)
        receive.use_apop_checkbtn          = use_apop_checkbtn;
        receive.rmmail_checkbtn            = rmmail_checkbtn;
        receive.leave_time_entry         = leave_time_entry;
-       receive.getall_checkbtn            = getall_checkbtn;
        receive.size_limit_checkbtn        = size_limit_checkbtn;
        receive.size_limit_entry         = size_limit_entry;
        receive.filter_on_recv_checkbtn    = filter_on_recv_checkbtn;

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 54f02d8aa9e04d7ace1e47ede71110fc982d1020..600aea77719665cf9a634b453cf20829ce8a5f98 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -85,7 +85,6 @@ struct _PrefsAccount
        gboolean use_apop_auth;
        gboolean rmmail;
        gint msg_leave_time;
-       gboolean getall;
        gboolean recv_at_getall;
        gboolean sd_rmmail_on_download;
        gboolean sd_filter_on_recv;