* Fixes #NB57458

	* Fixes a bug when applying message count limits, we're trying to retrieve more msgs than the new available ones
	* Removed an invalid comment

pmo-trunk-r1987

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 06384eb..12001e1 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -853,7 +853,7 @@ update_account_thread (gpointer thr_user_data)
                   user to download them all */
                priv->done = 0;
                priv->total = MIN (new_headers->len, info->retrieve_limit);
-               while ((msg_num < info->retrieve_limit)) {
+               while ((msg_num < priv->total)) {
 
                        TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers, msg_num));
                        TnyFolder *folder = tny_header_get_folder (header);
@@ -888,7 +888,6 @@ update_account_thread (gpointer thr_user_data)
                (info->transport_account);
 
        timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
-       /* TODO: Is this meant to block? */
        modest_tny_send_queue_try_to_send (send_queue);
        g_source_remove (timeout);
 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7fcc9a4..c97f21e 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1169,7 +1169,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                /* Show account details */
                modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        } else if (modest_tny_folder_store_is_virtual_local_folders  (folder_store )) {
-               printf ("DEBUG: %s: folder store.\n", __FUNCTION__);
                //TODO: Set the virtual folder store as the "active account" somehow:
                modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        } else {