[evolution-mapi] Adapt to changes in evolution-data-server from bug #656058
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Adapt to changes in evolution-data-server from bug #656058
- Date: Mon, 8 Aug 2011 08:51:53 +0000 (UTC)
commit 9f92563931042959872348def066811d09a7e00a
Author: Milan Crha <mcrha redhat com>
Date: Mon Aug 8 10:51:17 2011 +0200
Adapt to changes in evolution-data-server from bug #656058
src/addressbook/e-book-backend-mapi-contacts.c | 2 +-
src/addressbook/e-book-backend-mapi.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi-contacts.c b/src/addressbook/e-book-backend-mapi-contacts.c
index ff612fd..1279be6 100644
--- a/src/addressbook/e-book-backend-mapi-contacts.c
+++ b/src/addressbook/e-book-backend-mapi-contacts.c
@@ -296,7 +296,7 @@ mapi_book_write_props (ExchangeMapiConnection *conn, mapi_id_t fid, TALLOC_CTX *
uid = e_contact_get_const (mcd->contact, E_CONTACT_UID);
if (uid)
- old_contact = e_book_backend_sqlitedb_get_contact (mcd->db, EMA_EBB_CACHE_FOLDERID, uid, NULL, &error);
+ old_contact = e_book_backend_sqlitedb_get_contact (mcd->db, EMA_EBB_CACHE_FOLDERID, uid, NULL, NULL, &error);
if (!error && old_contact) {
member_values = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 1be857a..4493f07 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -350,7 +350,7 @@ ebbm_update_cache_cb (gpointer data)
if (!error && !g_cancellable_is_cancelled (priv->update_cache)) {
GSList *cache_keys, *c;
- cache_keys = e_book_backend_sqlitedb_search_uids (priv->db, EMA_EBB_CACHE_FOLDERID, NULL, NULL);
+ cache_keys = e_book_backend_sqlitedb_search_uids (priv->db, EMA_EBB_CACHE_FOLDERID, NULL, NULL, NULL);
for (c = cache_keys; c; c = c->next) {
const gchar *uid = c->data;
@@ -630,7 +630,7 @@ ebbm_get_contact (EBookBackendMAPI *ebma, GCancellable *cancellable, const gchar
contact = e_book_backend_sqlitedb_get_vcard_string (priv->db,
EMA_EBB_CACHE_FOLDERID,
- id, NULL, error);
+ id, NULL, NULL, error);
if (contact)
*vcard = contact;
else
@@ -657,7 +657,7 @@ ebbm_get_contact_list (EBookBackendMAPI *ebma, GCancellable *cancellable, const
}
hits = e_book_backend_sqlitedb_search (priv->db, EMA_EBB_CACHE_FOLDERID,
- query, NULL, &err);
+ query, NULL, NULL, NULL, &err);
for (l = hits; !err && l; l = l->next) {
EbSdbSearchData *sdata = (EbSdbSearchData *) l->data;
@@ -1441,7 +1441,7 @@ e_book_backend_mapi_update_view_by_cache (EBookBackendMAPI *ebma, EDataBookView
g_return_if_fail (db != NULL);
hits = e_book_backend_sqlitedb_search (db, EMA_EBB_CACHE_FOLDERID,
- query, NULL, error);
+ query, NULL, NULL, NULL, error);
for (l = hits; (!error || !*error) && l; l = l->next) {
EbSdbSearchData *sdata = (EbSdbSearchData *) l->data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]