eds: remove urls

URLs which are represented by EContact fields cannot be removed. When
setting UrlFieldDetails, the _set_contact_urls method must remove
X-EVOLUTION-BLOG-URL, X-EVOLUTION-VIDEO-URL, FBURL and URL in addition
to X-URIS, which was already removed before setting the new set of
values.

Closes: https://bugzilla.gnome.org/show_bug.cgi?id=688923

diff --git a/NEWS b/NEWS
index a95b303..e12228b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Bugs fixed:
 • Bug 686673 — Build error: libsocialweb backend doesn't implement new Backend
   functions
 • Bug 688834 — getting properties creates data structures over and over again
+• Bug 688923 — remove URLs (blog, free/busy, video, home page)
 
 API changes:
 • Add Backend.enable_persona_store and disable_persona_store.

diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index bc4e4d9..ee21d06 100644 (file)
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -1469,6 +1469,10 @@ public class Edsf.PersonaStore : Folks.PersonaStore
     {
       var vcard = (E.VCard) contact;
       vcard.remove_attributes (null, "X-URIS");
+      contact.set (ContactField.HOMEPAGE_URL, null);
+      contact.set (ContactField.VIDEO_URL, null);
+      contact.set (ContactField.BLOG_URL, null);
+      contact.set (ContactField.FREEBUSY_URL, null);
 
       foreach (var u in urls)
         {