diff options
author | root <root@rshg054.dnsready.net> | 2012-10-20 01:22:20 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-20 01:22:20 -0700 |
commit | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (patch) | |
tree | 36488f90eaa723f707c26f79ba771bb2910e8368 /community-testing/glabels/glabels-3.0.0-new-eds.patch | |
parent | dcc55a1cfa32068d0759c1c8307f6c07c11aec99 (diff) |
Sat Oct 20 01:22:19 PDT 2012
Diffstat (limited to 'community-testing/glabels/glabels-3.0.0-new-eds.patch')
-rw-r--r-- | community-testing/glabels/glabels-3.0.0-new-eds.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/community-testing/glabels/glabels-3.0.0-new-eds.patch b/community-testing/glabels/glabels-3.0.0-new-eds.patch new file mode 100644 index 000000000..9cae4c076 --- /dev/null +++ b/community-testing/glabels/glabels-3.0.0-new-eds.patch @@ -0,0 +1,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> |