evolution-data-server

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

  1. lp720434
  2. Merge into ubuntu
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 83
Proposed branch: lp:~cyphermox/evolution-data-server/lp720434
Merge into: lp:~ubuntu-desktop/evolution-data-server/ubuntu
Diff against target: 55 lines (+13/-8)
2 files modified
debian/changelog (+6/-1)
debian/patches/03-gdata-0.7-port.patch (+7/-7)
To merge this branch: bzr merge lp:~cyphermox/evolution-data-server/lp720434
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+56799@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good! approved :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-14 06:10:20 +0000
3+++ debian/changelog 2011-04-07 16:15:54 +0000
4@@ -1,9 +1,14 @@
5 evolution-data-server (2.32.2-0ubuntu2) UNRELEASED; urgency=low
6
7+ [ Krzysztof Klimonda ]
8 * debian/control:
9 - updated libgtk2.0-dev dependency.
10
11- -- Krzysztof Klimonda <kklimonda@ubuntu.com> Mon, 14 Mar 2011 07:08:45 +0100
12+ [ Mathieu Trudel-Lapierre ]
13+ * debian/patches/03-gdata-0.7-port.patch: Correct libgdata 0.7 port patch to
14+ properly set the updated-min property for Google contacts. (LP: #720434)
15+
16+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 06 Apr 2011 16:26:11 -0400
17
18 evolution-data-server (2.32.2-0ubuntu1) natty; urgency=low
19
20
21=== modified file 'debian/patches/03-gdata-0.7-port.patch'
22--- debian/patches/03-gdata-0.7-port.patch 2010-12-15 16:51:54 +0000
23+++ debian/patches/03-gdata-0.7-port.patch 2011-04-07 16:15:54 +0000
24@@ -1,13 +1,13 @@
25-Index: evolution-data-server-2.32.1/addressbook/backends/google/e-book-backend-google.c
26+Index: evolution-data-server-2.32.2/addressbook/backends/google/e-book-backend-google.c
27 ===================================================================
28---- evolution-data-server-2.32.1.orig/addressbook/backends/google/e-book-backend-google.c 2010-10-29 06:22:59.000000000 -0400
29-+++ evolution-data-server-2.32.1/addressbook/backends/google/e-book-backend-google.c 2010-12-14 16:35:31.388384002 -0500
30+--- evolution-data-server-2.32.2.orig/addressbook/backends/google/e-book-backend-google.c 2010-11-22 22:26:37.000000000 -0500
31++++ evolution-data-server-2.32.2/addressbook/backends/google/e-book-backend-google.c 2011-04-06 16:25:52.028825647 -0400
32 @@ -511,7 +511,7 @@
33 GTimeVal updated;
34
35 g_assert (g_time_val_from_iso8601 (last_updated, &updated) == TRUE);
36 - gdata_query_set_updated_min (query, &updated);
37-+ gdata_query_set_updated_min (query, ((long) &updated.tv_sec / 60));
38++ gdata_query_set_updated_min (query, updated.tv_sec);
39 gdata_contacts_query_set_show_deleted (GDATA_CONTACTS_QUERY (query), TRUE);
40 }
41
42@@ -24,10 +24,10 @@
43 NULL, &error));
44 g_object_unref (entry);
45
46-Index: evolution-data-server-2.32.1/configure.ac
47+Index: evolution-data-server-2.32.2/configure.ac
48 ===================================================================
49---- evolution-data-server-2.32.1.orig/configure.ac 2010-12-14 16:35:38.008384001 -0500
50-+++ evolution-data-server-2.32.1/configure.ac 2010-12-14 16:35:51.328384001 -0500
51+--- evolution-data-server-2.32.2.orig/configure.ac 2010-12-27 08:19:33.000000000 -0500
52++++ evolution-data-server-2.32.2/configure.ac 2011-04-06 16:25:19.628825650 -0400
53 @@ -325,12 +325,6 @@
54 libsoup-2.4 >= libsoup_minimum_version
55 libgdata >= libgdata_minimum_version])

Subscribers

People subscribed via source and target branches