[patch] glabels-eds-3.6.patch

glabels-eds-3.6.patch (text/plain), 1.82 KB, created by Ed Catmur on 2013-02-16 20:05:55 UTC

diff --git a/src/merge-evolution.c b/src/merge-evolution.c
index bd14483..c2c9133 100644
--- a/src/merge-evolution.c
+++ b/src/merge-evolution.c
@@ -29,7 +29,7 @@
 
 #include "merge-evolution.h"
 
-#include <libebook/e-book.h>
+#include <libebook/libebook.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
@@ -302,6 +302,8 @@ gl_merge_evolution_open (glMerge *merge)
 {
         glMergeEvolution *merge_evolution;
         EBookQuery *query;
+        ESourceRegistry *registry;
+        ESource *source;
         gboolean status;
         GList *fields, *iter;
         EContactField *field_id;
@@ -317,7 +319,23 @@ gl_merge_evolution_open (glMerge *merge)
                 return;
         }
 
-        merge_evolution->priv->book = e_book_new_system_addressbook(&error);
+        registry = e_source_registry_new_sync(NULL, &error);
+        if (!registry) {
+                g_warning ("Couldn't open registry.");
+                if (error)
+                {
+                        g_warning ("e_source_registry_new_sync: %s", error->message);
+                        g_error_free (error);
+                }
+                e_book_query_unref(query);
+                return;
+        }
+
+        source = e_source_registry_ref_default_address_book(registry);
+        g_object_unref(registry);
+
+        merge_evolution->priv->book = e_book_new(source, &error);
+        g_object_unref(source);
         if (!merge_evolution->priv->book) {
                 g_warning ("Couldn't open addressbook.");
                 if (error)
diff --git a/src/merge-vcard.c b/src/merge-vcard.c
index da1deff..6554015 100644
--- a/src/merge-vcard.c
+++ b/src/merge-vcard.c
@@ -27,7 +27,7 @@
 
 #include "merge-vcard.h"
 
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>