diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-02-04 12:56:54 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-02-04 12:56:54 +0100 |
| commit | 7145a1e240c85d2795398ca34cf7ed77ff61da31 (patch) | |
| tree | 18b326cee6aa345c8b42b3e7ffb93bbf8c3518de | |
| parent | 3e7b237a6242a724830a412b95bbf8a80eb65d99 (diff) | |
| download | evolution-data-server-7145a1e240c85d2795398ca34cf7ed77ff61da31.tar.gz | |
Bug #675287 - Spool file account doesn't show messages
| -rw-r--r-- | camel/providers/local/camel-mbox-summary.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c index 7ca10e557..a562ce726 100644 --- a/camel/providers/local/camel-mbox-summary.c +++ b/camel/providers/local/camel-mbox-summary.c @@ -744,8 +744,8 @@ mbox_summary_sync_full (CamelMboxSummary *mbs, } static gint -cms_sort_frompos (gpointer a, - gpointer b, +cms_sort_frompos (gconstpointer a, + gconstpointer b, gpointer data) { CamelFolderSummary *summary = (CamelFolderSummary *) data; @@ -828,7 +828,7 @@ mbox_summary_sync_quick (CamelMboxSummary *mbs, /* Sync only the changes */ summary = camel_folder_summary_get_changed ((CamelFolderSummary *) mbs); if (summary->len) - g_ptr_array_sort_with_data (summary, (GCompareDataFunc) cms_sort_frompos, (gpointer) mbs); + g_ptr_array_sort_with_data (summary, cms_sort_frompos, mbs); for (i = 0; i < summary->len; i++) { gint xevoffset; @@ -1095,6 +1095,9 @@ camel_mbox_summary_sync_mbox (CamelMboxSummary *cls, camel_folder_summary_prepare_fetch_all (s, NULL); known_uids = camel_folder_summary_get_array (s); + /* walk them in the same order as stored in the file */ + if (known_uids->len) + g_ptr_array_sort_with_data (known_uids, cms_sort_frompos, mbs); for (i = 0; known_uids && i < known_uids->len; i++) { gint pc = (i + 1) * 100 / known_uids->len; @@ -1127,8 +1130,7 @@ camel_mbox_summary_sync_mbox (CamelMboxSummary *cls, if (camel_mime_parser_tell_start_from (mp) != info->frompos) { g_warning ( - "Didn't get the next message where " - "I expected (%d) got %d instead", + "Didn't get the next message where I expected (%d) got %d instead", (gint) info->frompos, (gint) camel_mime_parser_tell_start_from (mp)); g_set_error ( |