[evolution-ews] Remove libedata-book-compat.[ch]
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] Remove libedata-book-compat.[ch]
- Date: Tue, 18 Oct 2011 11:44:09 +0000 (UTC)
commit f5ae22c3342f01dea767c8b501c6739479035a9c
Author: David Woodhouse <David Woodhouse intel com>
Date: Tue Oct 18 12:32:59 2011 +0100
Remove libedata-book-compat.[ch]
src/addressbook/Makefile.am | 2 -
src/addressbook/e-book-backend-ews.c | 11 ++--
src/addressbook/libedata-book-compat.c | 83 --------------------------------
src/addressbook/libedata-book-compat.h | 34 -------------
4 files changed, 5 insertions(+), 125 deletions(-)
---
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index ee622f0..7264a9c 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -21,8 +21,6 @@ libebookbackendews_la_CPPFLAGS = \
$(SOUP_CFLAGS)
libebookbackendews_la_SOURCES = \
- libedata-book-compat.h \
- libedata-book-compat.c \
e-book-backend-sqlitedb.c \
e-book-backend-sqlitedb.h \
e-book-backend-ews-utils.c \
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 52bd6a2..f45a065 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -50,7 +50,6 @@
#include "lzx/ews-oal-decompress.h"
#include "ews-oab-decoder.h"
#include "e-ews-item-change.h"
-#include "libedata-book-compat.h"
#include "e-ews-message.h"
#include "e-ews-connection.h"
@@ -863,9 +862,9 @@ ews_book_remove_contact_cb (GObject *object, GAsyncResult *res, gpointer user_da
deleted = e_book_backend_sqlitedb_remove_contacts (priv->ebsdb, priv->folder_id, remove_contact->sl_ids, &error);
if (deleted)
- e_data_book_respond_remove_contacts_compat (remove_contact->book, remove_contact->opid, EDB_ERROR (SUCCESS), remove_contact->sl_ids);
+ e_data_book_respond_remove_contacts (remove_contact->book, remove_contact->opid, EDB_ERROR (SUCCESS), remove_contact->sl_ids);
else {
- e_data_book_respond_remove_contacts_compat (remove_contact->book, remove_contact->opid, EDB_ERROR_EX (OTHER_ERROR, error->message), NULL);
+ e_data_book_respond_remove_contacts (remove_contact->book, remove_contact->opid, EDB_ERROR_EX (OTHER_ERROR, error->message), NULL);
g_warning ("\nError removing contact %s \n", error->message);
}
@@ -1159,17 +1158,17 @@ e_book_backend_ews_get_contact_list (EBookBackend *backend,
case MODE_LOCAL :
- e_data_book_respond_get_contact_list_compat (book, opid, EDB_ERROR (SUCCESS), vcard_list);
+ e_data_book_respond_get_contact_list (book, opid, EDB_ERROR (SUCCESS), vcard_list);
return;
case MODE_REMOTE:
if (egwb->priv->cnc == NULL) {
- e_data_book_respond_get_contact_list_compat (book, opid, EDB_ERROR (AUTHENTICATION_REQUIRED), NULL);
+ e_data_book_respond_get_contact_list (book, opid, EDB_ERROR (AUTHENTICATION_REQUIRED), NULL);
return;
}
- e_data_book_respond_get_contact_list_compat (book, opid, EDB_ERROR (SUCCESS), vcard_list);
+ e_data_book_respond_get_contact_list (book, opid, EDB_ERROR (SUCCESS), vcard_list);
return;
default :
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]