git.sur5r.net Git - glabels/blob - debian/patches/0004-unbreak-with-evolution-data-server-3.6.0.patch

   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
   4
   5 https://bugzilla.gnome.org/show_bug.cgi?id=685130
   6 ---
   7  src/merge-evolution.c | 31 ++++++++++++++++++++++++++++---
   8  src/merge-vcard.c     |  2 +-
   9  2 files changed, 29 insertions(+), 4 deletions(-)
  10
  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
  15 @@ -29,7 +29,7 @@
  16
  17  #include "merge-evolution.h"
  18
  19 -#include <libebook/e-book.h>
  20 +#include <libebook/libebook.h>
  21  #include <glib/gi18n.h>
  22  #include <stdio.h>
  23  #include <string.h>
  24 @@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gconstpointer *a, gconstpointer *b)
  25  /*--------------------------------------------------------------------------*/
  26  /* Open merge source.                                                       */
  27  /*--------------------------------------------------------------------------*/
  28 +static EBook *
  29 +gl_open_system_addressbook (GError **error)
  30 +{
  31 +   ESourceRegistry *registry;
  32 +   EBook *book = NULL;
  33 +   ESource *source;
  34 +
  35 +   registry = e_source_registry_new_sync (NULL, error);
  36 +   if (!registry)
  37 +       return NULL;
  38 +
  39 +   source = e_source_registry_ref_builtin_address_book (registry);
  40 +   if (!source) {
  41 +       g_object_unref (registry);
  42 +       return NULL;
  43 +   }
  44 +
  45 +   book = e_book_new (source, error);
  46 +
  47 +   g_object_unref (source);
  48 +   g_object_unref (registry);
  49 +
  50 +   return book;
  51 +}
  52 +
  53  static void
  54  gl_merge_evolution_open (glMerge *merge)
  55  {
  56 @@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
  57                  return;
  58          }
  59
  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.");
  64                  if (error)
  65                  {
  66 -                        g_warning ("e_book_new_system_addressbook: %s", error->message);
  67 +                        g_warning ("gl_open_system_addressbook: %s", error->message);
  68                          g_error_free (error);
  69                  }
  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
  75 @@ -27,7 +27,7 @@
  76
  77  #include "merge-vcard.h"
  78
  79 -#include <libebook/e-contact.h>
  80 +#include <libebook/libebook.h>
  81  #include <stdio.h>
  82  #include <string.h>
  83  #include <errno.h>