r2332 - in /unstable/evolution-data-server/debian: changelog patches/04_mbox_index.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 10 18:16:56 2013
New Revision: 2332

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2332
Log:
04_mbox_index.patch: patch from upstream git. Correctly display 
emails from mboxes. Closes: #640851.

Added:
    unstable/evolution-data-server/debian/patches/04_mbox_index.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/series

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2332&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun Feb 10 18:16:56 2013
@@ -1,3 +1,10 @@
+evolution-data-server (3.4.4-3) unstable; urgency=low
+
+  * 04_mbox_index.patch: patch from upstream git. Correctly display 
+    emails from mboxes. Closes: #640851.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 10 Feb 2013 19:16:56 +0100
+
 evolution-data-server (3.4.4-2) unstable; urgency=low
 
   * d/p/01_Save_also_UID_REV_in_WebDAV_backend.patch: Save contact UID value

Added: unstable/evolution-data-server/debian/patches/04_mbox_index.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/04_mbox_index.patch?rev=2332&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/04_mbox_index.patch (added)
+++ unstable/evolution-data-server/debian/patches/04_mbox_index.patch Sun Feb 10 18:16:56 2013
@@ -1,0 +1,40 @@
+From 70935cf6280b7730c439ccdbcb4193effb80961f Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 04 Feb 2013 11:56:26 +0000
+Subject: Bug #675287 - Spool file account doesn't show messages
+
+---
+Index: evolution-data-server-3.4.4/camel/providers/local/camel-mbox-summary.c
+===================================================================
+--- evolution-data-server-3.4.4.orig/camel/providers/local/camel-mbox-summary.c	2013-02-10 18:50:31.159779464 +0100
++++ evolution-data-server-3.4.4/camel/providers/local/camel-mbox-summary.c	2013-02-10 18:50:31.151779412 +0100
+@@ -744,8 +744,8 @@ mbox_summary_sync_full (CamelMboxSummary
+ }
+ 
+ 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 (CamelMboxSummar
+ 	/* 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;
+@@ -1094,6 +1094,9 @@ camel_mbox_summary_sync_mbox (CamelMboxS
+ 
+ 	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;
+ 

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2332&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Sun Feb 10 18:16:56 2013
@@ -1,4 +1,5 @@
 01_Save_also_UID_REV_in_WebDAV_backend.patch
 02-Check_email_value_in_e_destination_set_contact.patch
 03_EBookBackendSqliteDB_Escape_SQL_strings.patch
+04_mbox_index.patch
 20_gettext_intltool.patch