r2122 - in /squeeze/evolution-data-server/debian: changelog patches/02_data_book_respond_get_changes_missing_array_add.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Wed Mar 28 20:10:56 2012
New Revision: 2122

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2122
Log:
Add 02_data_book_respond_get_changes_missing_array_add.patch, to fix
e_book_get_changes() not returning any changes. Fix reported and patch
fished in upstream Git by Chris Frey. Thanks a lot!
(closes: #641898, #658445)

Added:
    squeeze/evolution-data-server/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch
Modified:
    squeeze/evolution-data-server/debian/changelog
    squeeze/evolution-data-server/debian/patches/series

Modified: squeeze/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/squeeze/evolution-data-server/debian/changelog?rev=2122&op=diff
==============================================================================
--- squeeze/evolution-data-server/debian/changelog (original)
+++ squeeze/evolution-data-server/debian/changelog Wed Mar 28 20:10:56 2012
@@ -1,3 +1,12 @@
+evolution-data-server (2.30.3-2+squeeze1) unstable; urgency=low
+
+  * Add 02_data_book_respond_get_changes_missing_array_add.patch, to fix
+    e_book_get_changes() not returning any changes. Fix reported and patch
+    fished in upstream Git by Chris Frey. Thanks a lot!
+    (closes: #641898, #658445)
+
+ -- Jordi Mallach <jordi at debian.org>  Wed, 28 Mar 2012 20:21:19 +0200
+
 evolution-data-server (2.30.3-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: squeeze/evolution-data-server/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/squeeze/evolution-data-server/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch?rev=2122&op=file
==============================================================================
--- squeeze/evolution-data-server/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch (added)
+++ squeeze/evolution-data-server/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch Wed Mar 28 20:10:56 2012
@@ -1,0 +1,35 @@
+From 15ad5dc232f493afef212a8217e82eedd0fe6e64 Mon Sep 17 00:00:00 2001
+From: Chris Frey <cdfrey at foursquare.net>
+Date: Thu, 22 Sep 2011 23:07:29 -0400
+Subject: [PATCH] Fixed libedata-book's e_data_book_respond_get_changes(): missing array add
+
+When building the get_changes DBUS response, the code forgot to add the
+values to the response array, resulting in get_changes calls that never
+returned any data.
+
+This fixes Ubuntu bug:
+https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/658459
+
+and Debian bug:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641898
+---
+ addressbook/libedata-book/e-data-book.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
+index 7794e8b..d7a2a80 100644
+--- a/addressbook/libedata-book/e-data-book.c
++++ b/addressbook/libedata-book/e-data-book.c
+@@ -620,6 +620,10 @@ e_data_book_respond_get_changes (EDataBook *book, guint32 opid, EDataBookStatus
+ 			/* Now change->vcard is owned by the GValue */
+ 
+ 			g_free (change);
++
++			/* append vals to array */
++			g_ptr_array_add(array, vals);
++
+ 			changes = g_list_remove (changes, change);
+ 		}
+ 
+-- 
+1.7.2.3

Modified: squeeze/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/squeeze/evolution-data-server/debian/patches/series?rev=2122&op=diff
==============================================================================
--- squeeze/evolution-data-server/debian/patches/series (original)
+++ squeeze/evolution-data-server/debian/patches/series Wed Mar 28 20:10:56 2012
@@ -1,4 +1,5 @@
 01_imapx_lockup.patch
+02_data_book_respond_get_changes_missing_array_add.patch
 25_mute-debug-messages.patch
 45_libcamel_providers_version.patch
 65_evolution-color.patch