From: Raul Gutierrez Segales <rgs@collabora.co.uk>
Date: Mon, 29 Aug 2011 17:25:00 +0000 (+0100)
Subject: e-d-s: we should use the Persona's iid as local-ids
X-Git-Tag: FOLKS_0_6_2~101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19a426de3734cba718bc4bfa7372b2d8656ff614;p=platform%2Fupstream%2Ffolks.git

e-d-s: we should use the Persona's iid as local-ids

If we don't and use the contact_id as before, linking Personas
from different PersonaStores won't work.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=657635
---

diff --git a/NEWS b/NEWS
index 602f4ee..7a401c0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Bugs fixed:
 * Bug 645056 — TpLowlevel library should have only static public functions
 * Bug 653777 — Would be nice to have a helper function to create a writable
   persona
+* Bug 657635 — Linking personas from different (e-d-s) stores is not working
 
 API changes:
 * Add PersonaStore:always-writeable-properties property
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 9f48a32..4dc8043 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -161,9 +161,9 @@ public class Edsf.Persona : Folks.Persona,
     {
       get
         {
-          if (this._local_ids.contains (this.contact_id) == false)
+          if (this._local_ids.contains (this.iid) == false)
             {
-              this._local_ids.add (this.contact_id);
+              this._local_ids.add (this.iid);
             }
           return this._local_ids_ro;
         }