[evolution-data-server/gnome-3-16] Bug 691493 - [IMAPx] Show progress when fetching summary information

[Milan Crha <mcrha src gnome org>]

commit 457a6166ca40e446e263315885a3e7ac3417d88d
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 15 17:18:38 2015 +0200

    Bug 691493 - [IMAPx] Show progress when fetching summary information

 camel/providers/imapx/camel-imapx-server.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 62b477a..278e995 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -2501,8 +2501,14 @@ imapx_untagged_fetch (CamelIMAPXServer *is,
                                        camel_folder_change_info_recent_uid (data->changes, mi->uid);
 
                                        if (messages > 0) {
+                                               GCancellable *use_cancellable;
                                                gint cnt = (camel_folder_summary_count (folder->summary) * 
100) / messages;
-                                               camel_operation_progress (cancellable, cnt ? cnt : 1);
+
+                                               use_cancellable = camel_imapx_job_get_cancellable (job);
+                                               if (!use_cancellable)
+                                                       use_cancellable = cancellable;
+
+                                               camel_operation_progress (use_cancellable, cnt ? cnt : 1);
                                        }
                                } else {
                                        camel_message_info_unref (mi);