[evolution-ews/evolution-ews-3-12] Fix build for oab-decode-test, port it to EBookSqlite

[David Woodhouse <dwmw2 src gnome org>]

commit c6362d907d1de4dad18fdc4ba71965643c6f5f61
Author: David Woodhouse <David Woodhouse intel com>
Date:   Fri Sep 5 13:16:14 2014 +0100

    Fix build for oab-decode-test, port it to EBookSqlite
    
    (cherry picked from commit 48b075a457625831f3d294a494fe0be8add27bb3)

 src/addressbook/Makefile.am       |    4 +---
 src/addressbook/oab-decode-test.c |   17 +++++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index c1a694c..03c2993 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -59,8 +59,6 @@ libebookbackendews_la_LDFLAGS = \
 
 noinst_PROGRAMS = gal-lzx-decompress-test oab-decode-test
 
-oab-decode-test$(EXEEXT): libebookbackendews.la
-
 oab_decode_test_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(LIBEBOOK_CFLAGS) \
@@ -75,7 +73,7 @@ oab_decode_test_LDADD = \
        $(GNOME_PLATFORM_LIBS) \
        $(LIBEBOOK_LIBS) \
        $(LIBEDATABOOK_LIBS)  \
-       $(top_builddir)/src/addressbook/libebookbackendews.la
+       libebookbackendews.la
        $(NULL)
 
 gal_lzx_decompress_test_CPPFLAGS = \
diff --git a/src/addressbook/oab-decode-test.c b/src/addressbook/oab-decode-test.c
index 04b4cb9..bdc8e4f 100644
--- a/src/addressbook/oab-decode-test.c
+++ b/src/addressbook/oab-decode-test.c
@@ -14,7 +14,7 @@
 struct _db_data {
        GSList *contact_collector;
        guint collected_length;
-       EBookBackendSqliteDB *summary;
+       EBookSqlite *summary;
        const gchar *folderid;
 };
 
@@ -32,7 +32,8 @@ ews_test_store_contact (EContact *contact,
 
        if (data->collected_length == 1000 || percent >= 100) {
                data->contact_collector = g_slist_reverse (data->contact_collector);
-               e_book_backend_sqlitedb_add_contacts (data->summary, data->folderid, data->contact_collector, 
FALSE, error);
+               e_book_sqlite_add_contacts (data->summary, data->contact_collector, NULL,
+                                           FALSE, NULL, error);
                g_print ("percent complete %d \n", percent);
 
                g_slist_foreach (data->contact_collector, (GFunc) g_object_unref, NULL);
@@ -46,7 +47,7 @@ gint
 main (gint argc,
       gchar *argv[])
 {
-       EBookBackendSqliteDB *summary;
+       EBookSqlite *summary;
        EwsOabDecoder *eod;
        GError *err = NULL;
        GTimer *timer;
@@ -59,8 +60,16 @@ main (gint argc,
                return -1;
        }
 
-       summary = e_book_backend_sqlitedb_new (argv[2], "dum", "de", "dum", TRUE, NULL);
+       summary = e_book_sqlite_new (argv[2], NULL, &err);
+       if (err) {
+               printf("err: %s\n", err->message);
+               exit(1);
+       }
        eod = ews_oab_decoder_new (argv[1], argv[2], &err);
+       if (err) {
+               printf("err: %s\n", err->message);
+               exit(1);
+       }
 
        data.contact_collector = NULL;
        data.collected_length = 0;