blob: 9cae4c076edd5f39b71ffa90e571605cecee808f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c
--- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200
+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200
@@ -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>
@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon
/*--------------------------------------------------------------------------*/
/* Open merge source. */
/*--------------------------------------------------------------------------*/
+static EBook *
+gl_open_system_addressbook (GError **error)
+{
+ ESourceRegistry *registry;
+ EBook *book = NULL;
+ ESource *source;
+
+ registry = e_source_registry_new_sync (NULL, error);
+ if (!registry)
+ return NULL;
+
+ source = e_source_registry_ref_builtin_address_book (registry);
+ if (!source) {
+ g_object_unref (registry);
+ return NULL;
+ }
+
+ book = e_book_new (source, error);
+
+ g_object_unref (source);
+ g_object_unref (registry);
+
+ return book;
+}
+
static void
gl_merge_evolution_open (glMerge *merge)
{
@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
return;
}
- merge_evolution->priv->book = e_book_new_system_addressbook(&error);
+ merge_evolution->priv->book = gl_open_system_addressbook(&error);
if (!merge_evolution->priv->book) {
g_warning ("Couldn't open addressbook.");
if (error)
{
- g_warning ("e_book_new_system_addressbook: %s", error->message);
+ g_warning ("gl_open_system_addressbook: %s", error->message);
g_error_free (error);
}
e_book_query_unref(query);
diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c
--- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200
+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200
@@ -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>
|
