summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Cai <jeff.cai@sun.com>2010-07-21 18:18:12 +0800
committerJeff Cai <jeff.cai@sun.com>2010-07-21 18:18:12 +0800
commitadd347c79f3cedf5376753f0ba874289ffd889a7 (patch)
treeb6d330a1a7e82390fb3a148894717f99423226af
parente821d208286fe146f4e1252ed2ed4a87b94afc7a (diff)
downloadevolution-data-server-add347c79f3cedf5376753f0ba874289ffd889a7.tar.gz
Fix bug #624909
-rw-r--r--camel/providers/imapx/camel-imapx-server.c9
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 b807bdd02..bab7c5c98 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -1528,9 +1528,10 @@ imapx_untagged(CamelIMAPXServer *imap, GError **error)
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);
+ }
}
}
}
@@ -2382,7 +2383,7 @@ imapx_command_select_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
&cw->error, CAMEL_IMAPX_ERROR, 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;
cn = cn->next;