[folks] e-d-s: Vala dropped support for reordering GCancellable params
- From: Raul Gutierrez Segales <raulgs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] e-d-s: Vala dropped support for reordering GCancellable params
- Date: Mon, 22 Aug 2011 12:55:17 +0000 (UTC)
commit c0ecad63015078231934e63ec63f02b97defb730
Author: Raul Gutierrez Segales <rgs collabora co uk>
Date: Mon Aug 22 13:51:28 2011 +0100
e-d-s: Vala dropped support for reordering GCancellable params
A couple of e-d-s methods (get_contact, modify_contact,
get_backend_property, etc) experienced an automatic API
change in it's Vala binding due to Vala dropping support
for reordering GCancellable params.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=657067
NEWS | 1 +
backends/eds/lib/edsf-persona-store.vala | 35 +++++++++++++++--------------
tests/lib/eds/backend.vala | 10 ++++----
3 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/NEWS b/NEWS
index 097dc1b..520076b 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Overview of changes from libfolks 0.6.0 to libfolks 0.6.1
Bugs fixed:
* Bug 656659 â Use vcards for postal addresses
* Bug 655374 â Un-break avatar tests
+* Bug 657067 â Can't build EDS backend using Vala master
Overview of changes from libfolks 0.5.2 to libfolks 0.5.3
=========================================================
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index e9db1e4..4fe748a 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -314,6 +314,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
string added_uid;
var result = yield this._addressbook.add_contact (contact,
+ null,
out added_uid);
if (result)
@@ -364,7 +365,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
try
{
yield this._addressbook.remove_contact (
- ((Edsf.Persona) persona).contact);
+ ((Edsf.Persona) persona).contact, null);
}
catch (GLib.Error e)
{
@@ -543,7 +544,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
try
{
yield this._addressbook.get_backend_property ("supported-fields",
- out supported_fields, null);
+ null, out supported_fields);
/* We get a comma-separated list of fields back. */
if (supported_fields != null)
@@ -565,7 +566,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
try
{
got_view = yield this._addressbook.get_view (this._query_str,
- out this._ebookview);
+ null, out this._ebookview);
if (got_view == false)
{
@@ -667,7 +668,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_avatar (contact, avatar);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error e)
{
@@ -687,7 +688,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_web_service_addresses (contact,
web_service_addresses);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error e)
{
@@ -728,7 +729,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_urls (contact, urls);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error e)
{
@@ -811,7 +812,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_local_ids (contact, local_ids);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error e)
{
@@ -891,7 +892,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_attributes_string (contact, emails, "EMAIL",
E.ContactField.EMAIL);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -908,7 +909,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_attributes_string (contact, phones, "TEL",
E.ContactField.TEL);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -924,7 +925,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_postal_addresses (contact,
postal_fds);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -997,7 +998,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
contact.set (E.Contact.field_id ("full_name"), full_name);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -1014,7 +1015,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
contact.set (E.Contact.field_id ("nickname"), nickname);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -1029,7 +1030,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_notes (contact, notes);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -1064,7 +1065,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_name (contact, sname);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -1099,7 +1100,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_im_fds (contact, im_fds);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -1161,7 +1162,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_groups (contact, groups);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error error)
{
@@ -1193,7 +1194,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
{
E.Contact contact = ((Edsf.Persona) persona).contact;
yield this._set_contact_gender (contact, gender);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error e)
{
diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala
index 90de27f..6473d2a 100644
--- a/tests/lib/eds/backend.vala
+++ b/tests/lib/eds/backend.vala
@@ -58,9 +58,9 @@ public class EdsTest.Backend
E.Contact contact;
try
{
- yield this._addressbook.get_contact (uid, out contact);
+ yield this._addressbook.get_contact (uid, null, out contact);
this._set_contact_fields (contact, updated_data);
- yield this._addressbook.modify_contact (contact);
+ yield this._addressbook.modify_contact (contact, null);
}
catch (GLib.Error e)
{
@@ -74,8 +74,8 @@ public class EdsTest.Backend
E.Contact contact;
try
{
- yield this._addressbook.get_contact (uid, out contact);
- yield this._addressbook.remove_contact (contact);
+ yield this._addressbook.get_contact (uid, null, out contact);
+ yield this._addressbook.remove_contact (contact, null);
}
catch (GLib.Error e)
{
@@ -143,7 +143,7 @@ public class EdsTest.Backend
{
string added_uid;
yield this._addressbook.add_contact (contact,
- out added_uid);
+ null, out added_uid);
this._e_contacts.prepend ((owned) added_uid);
}
catch (GLib.Error e)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]