** Fix for bug #558883

2008-12-05  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #558883

	* camel/providers/imap/camel-imap-summary.c: Don't do DB sort from
	IMAP.

svn path=/trunk/; revision=9803

diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog
index 4b0e194..5267426 100644 (file)
--- a/camel/providers/imap/ChangeLog
+++ b/camel/providers/imap/ChangeLog
@@ -5,6 +5,13 @@
        * camel/providers/imap/camel-imap-folder.c: Delete mails for XGWMOVE
        when mails are moved.
 
+2008-12-05  Srinivasa Ragavan  <sragavan@novell.com>
+
+       ** Fix for bug #558883
+
+       * camel/providers/imap/camel-imap-summary.c: Don't do DB sort from
+       IMAP.
+
 2008-11-20  Milan Crha  <mcrha@redhat.com>
 
        ** Part of fix for bug #558883

diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index c52bff6..e6101fc 100644 (file)
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -163,6 +163,22 @@ sort_uid_cmp (void *enc, int len1, void * data1, int len2, void *data2)
        return (a1 < a1) ? -1 : (a1 > a2) ? 1 : 0;
 }
 
+static int
+uid_compare (const void *va, const void *vb)
+{
+       const char **sa = (const char **)va, **sb = (const char **)vb;
+       unsigned long a, b;
+
+       a = strtoul (*sa, NULL, 10);
+       b = strtoul (*sb, NULL, 10);
+       if (a < b)
+               return -1;
+       else if (a == b)
+               return 0;
+       else
+               return 1;
+}
+
 /**
  * camel_imap_summary_new:
  * @folder: Parent folder.
@@ -181,7 +197,8 @@ camel_imap_summary_new (struct _CamelFolder *folder, const char *filename)
        camel_exception_init (&ex);
 
        summary->folder = folder;
-       if (folder) {
+       /* Don't do DB sort. Its pretty slow to load */
+       if (folder && 0) {
                camel_db_set_collate (folder->parent_store->cdb_r, "uid", "imap_uid_sort", (CamelDBCollate)sort_uid_cmp);
                summary->sort_by = "uid";
                summary->collate = "imap_uid_sort";
@@ -199,6 +216,8 @@ camel_imap_summary_new (struct _CamelFolder *folder, const char *filename)
                camel_exception_clear (&ex);
        }
 
+       g_ptr_array_sort (summary->uids, (GCompareFunc) uid_compare); 
+
        return summary;
 }