--- a/src/merge-evolution.c +++ a/src/merge-evolution.c @@ -29,7 +29,7 @@ #include "merge-evolution.h" -#include +#include #include #include #include @@ -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) --- a/src/merge-vcard.c +++ a/src/merge-vcard.c @@ -27,7 +27,7 @@ #include "merge-vcard.h" -#include +#include #include #include #include