Merge lp:~cyphermox/evolution-data-server/lp720434 into lp:~ubuntu-desktop/evolution-data-server/ubuntu

[Mathieu Trudel-Lapierre]

Fixes the "Invalid query" error every time one tries to start using Google contacts.

By my testing contacts are very much usable now, I was able to add various data items to different contacts, delete some, etc.

[Didier Roche-Tolomelli (didrocks)]

Looks good! approved :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-14 06:10:20 +0000
+++ debian/changelog	2011-04-07 16:15:54 +0000
@@ -1,9 +1,14 @@
 evolution-data-server (2.32.2-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Krzysztof Klimonda ]
   * debian/control:
     - updated libgtk2.0-dev dependency. 
 
- -- Krzysztof Klimonda <[e-mail]>  Mon, 14 Mar 2011 07:08:45 +0100
+  [ Mathieu Trudel-Lapierre ]
+  * debian/patches/03-gdata-0.7-port.patch: Correct libgdata 0.7 port patch to
+    properly set the updated-min property for Google contacts. (LP: #720434)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 06 Apr 2011 16:26:11 -0400
 
 evolution-data-server (2.32.2-0ubuntu1) natty; urgency=low
 
 
=== modified file 'debian/patches/03-gdata-0.7-port.patch'
--- debian/patches/03-gdata-0.7-port.patch	2010-12-15 16:51:54 +0000
+++ debian/patches/03-gdata-0.7-port.patch	2011-04-07 16:15:54 +0000
@@ -1,13 +1,13 @@
-Index: evolution-data-server-2.32.1/addressbook/backends/google/e-book-backend-google.c
+Index: evolution-data-server-2.32.2/addressbook/backends/google/e-book-backend-google.c
 ===================================================================
---- evolution-data-server-2.32.1.orig/addressbook/backends/google/e-book-backend-google.c	2010-10-29 06:22:59.000000000 -0400
-+++ evolution-data-server-2.32.1/addressbook/backends/google/e-book-backend-google.c	2010-12-14 16:35:31.388384002 -0500
+--- evolution-data-server-2.32.2.orig/addressbook/backends/google/e-book-backend-google.c	2010-11-22 22:26:37.000000000 -0500
++++ evolution-data-server-2.32.2/addressbook/backends/google/e-book-backend-google.c	2011-04-06 16:25:52.028825647 -0400
 @@ -511,7 +511,7 @@
  		GTimeVal updated;
  
  		g_assert (g_time_val_from_iso8601 (last_updated, &updated) == TRUE);
 -		gdata_query_set_updated_min (query, &updated);
-+		gdata_query_set_updated_min (query, ((long) &updated.tv_sec / 60));
++		gdata_query_set_updated_min (query, updated.tv_sec);
  		gdata_contacts_query_set_show_deleted (GDATA_CONTACTS_QUERY (query), TRUE);
  	}
  
@@ -24,10 +24,10 @@
  			NULL, &error));
  	g_object_unref (entry);
  
-Index: evolution-data-server-2.32.1/configure.ac
+Index: evolution-data-server-2.32.2/configure.ac
 ===================================================================
---- evolution-data-server-2.32.1.orig/configure.ac	2010-12-14 16:35:38.008384001 -0500
-+++ evolution-data-server-2.32.1/configure.ac	2010-12-14 16:35:51.328384001 -0500
+--- evolution-data-server-2.32.2.orig/configure.ac	2010-12-27 08:19:33.000000000 -0500
++++ evolution-data-server-2.32.2/configure.ac	2011-04-06 16:25:19.628825650 -0400
 @@ -325,12 +325,6 @@
  	libsoup-2.4 >= libsoup_minimum_version
  	libgdata >= libgdata_minimum_version])