diff options
author | Milan Crha <mcrha@redhat.com> | 2019-04-16 17:35:47 +0200 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2019-04-16 17:35:47 +0200 |
commit | f449c392cf5f86b2fbf7d58e655c6b786c6574f2 (patch) | |
tree | 280362319642a065b539f85847f18590ffd61b03 | |
parent | 38ac367c332063404ec6c9404511fdb41f6d5946 (diff) | |
download | folks-wip/mcrha/eds-libical-glib.tar.gz |
Port to libebook API changeswip/mcrha/eds-libical-glib
-rw-r--r-- | backends/eds/lib/edsf-persona-store.vala | 6 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | tests/eds/helper-create-many-contacts.vala | 2 | ||||
-rw-r--r-- | tests/eds/helper-delete-contacts.vala | 2 | ||||
-rw-r--r-- | tests/lib/eds/backend.vala | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala index 33a10f2b..2311277b 100644 --- a/backends/eds/lib/edsf-persona-store.vala +++ b/backends/eds/lib/edsf-persona-store.vala @@ -610,7 +610,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore /* _addressbook is guaranteed to be non-null before we ensure that * prepare() has already been called. */ yield ((!) this._addressbook).remove_contact ( - ((Edsf.Persona) persona).contact, null); + ((Edsf.Persona) persona).contact, E.BookOperationFlags.NONE, null); } catch (GLib.Error e) { @@ -1258,7 +1258,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore /* Commit the new contact. _addressbook is asserted as being non-null * above. */ - yield ((!) this._addressbook).add_contact (contact, null, + yield ((!) this._addressbook).add_contact (contact, E.BookOperationFlags.NONE, null, out added_uid); debug ("Finished sending new contact to EDS; received UID %s.", @@ -1377,7 +1377,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore /* Commit the modification. _addressbook is asserted as being non-null * above. */ - yield ((!) this._addressbook).modify_contact (contact, null); + yield ((!) this._addressbook).modify_contact (contact, E.BookOperationFlags.NONE, null); timeout_id = Timeout.add_seconds (PersonaStore._property_change_timeout, () => { diff --git a/configure.ac b/configure.ac index f091fbe0..8626480b 100644 --- a/configure.ac +++ b/configure.ac @@ -261,8 +261,8 @@ AM_CONDITIONAL([ENABLE_LIBSOCIALWEB], GLIB_REQUIRED=2.40.0 VALA_REQUIRED=0.22.0.28-9090 TRACKER_SPARQL_REQUIRED=0.15.2 -EBOOK_REQUIRED=3.13.90 -EDATASERVER_REQUIRED=3.13.90 +EBOOK_REQUIRED=3.33.1 +EDATASERVER_REQUIRED=3.33.1 ZEITGEIST_REQUIRED=0.9.14 GEE_REQUIRED=0.8.4 diff --git a/tests/eds/helper-create-many-contacts.vala b/tests/eds/helper-create-many-contacts.vala index b5d2ab4b..632c1cd6 100644 --- a/tests/eds/helper-create-many-contacts.vala +++ b/tests/eds/helper-create-many-contacts.vala @@ -107,7 +107,7 @@ public class Main SList<string> uids; try { - book_client.add_contacts_sync (contacts, out uids, null); + book_client.add_contacts_sync (contacts, E.BookOperationFlags.NONE, out uids, null); } catch (Error e) { diff --git a/tests/eds/helper-delete-contacts.vala b/tests/eds/helper-delete-contacts.vala index 6853610a..74b84f21 100644 --- a/tests/eds/helper-delete-contacts.vala +++ b/tests/eds/helper-delete-contacts.vala @@ -41,7 +41,7 @@ public class Main SList<string> uids; book_client.get_contacts_uids_sync ( "(contains \"x-evolution-any-field\" \"\")", out uids); - book_client.remove_contacts_sync (uids); + book_client.remove_contacts_sync (uids, E.BookOperationFlags.NONE); } private static string _uid = ""; diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala index 22923ed5..e9fc587c 100644 --- a/tests/lib/eds/backend.vala +++ b/tests/lib/eds/backend.vala @@ -71,7 +71,7 @@ public class EdsTest.Backend { yield this._addressbook.get_contact (uid, null, out contact); this._set_contact_fields (contact, updated_data); - yield this._addressbook.modify_contact (contact, null); + yield this._addressbook.modify_contact (contact, E.BookOperationFlags.NONE, null); } catch (GLib.Error e) { @@ -86,7 +86,7 @@ public class EdsTest.Backend try { yield this._addressbook.get_contact (uid, null, out contact); - yield this._addressbook.remove_contact (contact, null); + yield this._addressbook.remove_contact (contact, E.BookOperationFlags.NONE, null); } catch (GLib.Error e) { @@ -211,7 +211,7 @@ public class EdsTest.Backend { GLib.SList<string> uids; - yield this._addressbook.add_contacts (contacts, null, out uids); + yield this._addressbook.add_contacts (contacts, E.BookOperationFlags.NONE, null, out uids); foreach (unowned string uid in uids) this._e_contacts += uid; |