[evolution-data-server/gnome-2-30] Fix bug #624909 (cherry picked from commit add347c79f3cedf5376753f0ba874289ffd889a7)

[David Woodhouse <dwmw2 src gnome org>]

commit 16580ec5d6c350dce54402bebaafb313449d6a41
Author: David Woodhouse <David Woodhouse intel com>
Date:   Sat Jul 31 16:26:45 2010 +0200

    Fix bug #624909
    (cherry picked from commit add347c79f3cedf5376753f0ba874289ffd889a7)

 camel/providers/imapx/camel-imapx-server.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 4a6746e..cef704f 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -1519,9 +1519,10 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 							g_hash_table_remove (ifolder->ignore_recent, mi->uid);
 						}
 
-						if (job->op)
-							camel_operation_progress (job->op, (camel_folder_summary_count (job->folder->summary)
-											    * 100)/ifolder->exists_on_server?:1);
+						if (job->op) {
+							int cnt = (camel_folder_summary_count (job->folder->summary) * 100 )/ifolder->exists_on_server;
+							camel_operation_progress (job->op, cnt?cnt:1);
+						}
 					}
 				}
 			}
@@ -2323,7 +2324,7 @@ imapx_command_select_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 				else {
 					camel_exception_setv (cw->ex, 1, "SELECT %s failed: %s",
 							      camel_folder_get_full_name(cw->select),
-							      ic->status->text?:"<unknown reason>");
+							      ic->status->text?ic->status->text:"<unknown reason>");
 				}
 				cw->complete(is, cw);
 				cw = cn;