1 From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
2 Date: Mon, 1 Apr 2013 10:53:59 +0200
3 Subject: unbreak with evolution-data-server >= 3.6.0
5 https://bugzilla.gnome.org/show_bug.cgi?id=685130
7 src/merge-evolution.c | 31 ++++++++++++++++++++++++++++---
8 src/merge-vcard.c | 2 +-
9 2 files changed, 29 insertions(+), 4 deletions(-)
11 diff --git a/src/merge-evolution.c b/src/merge-evolution.c
12 index bd14483..c3c2639 100644
13 --- a/src/merge-evolution.c
14 +++ b/src/merge-evolution.c
17 #include "merge-evolution.h"
19 -#include <libebook/e-book.h>
20 +#include <libebook/libebook.h>
21 #include <glib/gi18n.h>
24 @@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gconstpointer *a, gconstpointer *b)
25 /*--------------------------------------------------------------------------*/
26 /* Open merge source. */
27 /*--------------------------------------------------------------------------*/
29 +gl_open_system_addressbook (GError **error)
31 + ESourceRegistry *registry;
35 + registry = e_source_registry_new_sync (NULL, error);
39 + source = e_source_registry_ref_builtin_address_book (registry);
41 + g_object_unref (registry);
45 + book = e_book_new (source, error);
47 + g_object_unref (source);
48 + g_object_unref (registry);
54 gl_merge_evolution_open (glMerge *merge)
56 @@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
60 - merge_evolution->priv->book = e_book_new_system_addressbook(&error);
61 + merge_evolution->priv->book = gl_open_system_addressbook(&error);
62 if (!merge_evolution->priv->book) {
63 g_warning ("Couldn't open addressbook.");
66 - g_warning ("e_book_new_system_addressbook: %s", error->message);
67 + g_warning ("gl_open_system_addressbook: %s", error->message);
70 e_book_query_unref(query);
71 diff --git a/src/merge-vcard.c b/src/merge-vcard.c
72 index da1deff..6554015 100644
73 --- a/src/merge-vcard.c
74 +++ b/src/merge-vcard.c
77 #include "merge-vcard.h"
79 -#include <libebook/e-contact.h>
80 +#include <libebook/libebook.h>