[evolution-data-server] Bug 720657 - IMAPX: No new messages are received

[Matthew Barnes <mbarnes src gnome org>]

commit b0f5efddc2e9e1fe331508887df1fb3c1d62ad9e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jan 12 19:51:19 2014 -0500

    Bug 720657 - IMAPX: No new messages are received
    
    Regression caused by removal of "mobile mode".  I misinterpreted some
    complex expression embedded in a loop condition, which is why I don't
    like complex expressions in loop conditions - difficult to for others
    grok, which means high potential for mistakes.

 camel/providers/imapx/camel-imapx-server.c |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 2b93e2f..cd99f98 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -90,7 +90,6 @@ struct _RefreshInfoData {
        /* used for building uidset stuff */
        gint index;
        gint last_index;
-       gint fetch_msg_limit;
        CamelFetchType fetch_type;
        gboolean update_unseen;
        gboolean scan_changes;
@@ -3562,7 +3561,6 @@ imapx_server_fetch_new_messages (CamelIMAPXServer *is,
        data = g_slice_new0 (RefreshInfoData);
        data->changes = camel_folder_change_info_new ();
        data->update_unseen = update_unseen;
-       data->fetch_msg_limit = -1;
 
        job = camel_imapx_job_new (cancellable);
        job->type = IMAPX_JOB_FETCH_NEW_MESSAGES;
@@ -5326,8 +5324,6 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
        CamelFolder *folder;
        RefreshInfoData *data;
        gint i;
-       CamelIMAPXSettings *settings;
-       guint batch_count;
        GError *local_error = NULL;
 
        job = camel_imapx_command_get_job (ic);
@@ -5346,10 +5342,6 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
 
        isum = CAMEL_IMAPX_SUMMARY (folder->summary);
 
-       settings = camel_imapx_server_ref_settings (is);
-       batch_count = camel_imapx_settings_get_batch_fetch_count (settings);
-       g_object_unref (settings);
-
        i = data->index;
 
        if (camel_imapx_command_set_error_if_failed (ic, &local_error)) {
@@ -5369,9 +5361,6 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
        camel_folder_change_info_clear (data->changes);
 
        if (i < data->infos->len) {
-               gint total = camel_folder_summary_count (folder->summary);
-               gint fetch_limit = data->fetch_msg_limit;
-
                ic = camel_imapx_command_new (
                        is, "FETCH", mailbox, "UID FETCH ");
                ic->complete = imapx_command_step_fetch_done;
@@ -5380,11 +5369,7 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
 
                data->last_index = i;
 
-               for (; i < data->infos->len &&
-                       ((total && i == 0) ||
-                       ((fetch_limit != -1 && i < fetch_limit) ||
-                       (fetch_limit == -1 && i < batch_count))); i++) {
-
+               for (; i < data->infos->len; i++) {
                        gint res;
                        struct _refresh_info *r = &g_array_index (data->infos, struct _refresh_info, i);