[folks] consider an individual as favorite if one of its persona is a favorite

[Guillaume Desmottes <gdesmott src gnome org>]

commit ba71ffbfc6b3c3f5e006e2d6e164bdd07b5c9b8a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Jul 31 12:55:38 2013 +0200

    consider an individual as favorite if one of its persona is a favorite
    
    We used to consider all the personas as having the "is-favourite" property
    defined. So _update_single_valued_property was giving the priority to the
    primary store (usually EDS) leading to the individual being considered as
    unfavourite even if it has a Telepathy persona as favourite.
    
    We now consider the "is-favourite" property being defined if it's set to TRUE
    so any favourite persona will take presedence.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705196

 NEWS                  |    1 +
 folks/individual.vala |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index f23b82f..238e2cb 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Bugs fixed:
 • Bug 703830 — build: distcheck fails trying to delete
   libfolks_telepathy_la_vala.stamp
 • Bug 704922 — key-file: do not use deprecated loop_run_with_non_fatal_timeout()
+• Bug 705196 — Linking a favorite TP contact with a EDS one unfavorite it
 
 API changes:
 • Add PresenceDetails.client_types
diff --git a/folks/individual.vala b/folks/individual.vala
index b94bb15..80e7aa2 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -1620,7 +1620,7 @@ public class Folks.Individual : Object,
     {
       this._update_single_valued_property (typeof (FavouriteDetails), (p) =>
         {
-          return true;
+          return ((FavouriteDetails) p).is_favourite;
         }, (a, b) =>
         {
           var a_is_favourite = ((FavouriteDetails) a).is_favourite;