From 26310e79259dda6ee795361fb3d7164ea2d10eb3 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 18 Feb 2013 18:28:04 +0000 Subject: [PATCH] eds: Fix the type of a parameter in add_persona_from_details() This build breaker was introduced in commit dcc558d87d113dae0aa8721db3d80261c08dee57. --- backends/eds/lib/edsf-persona-store.vala | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala index 16503ac..6452230 100644 --- a/backends/eds/lib/edsf-persona-store.vala +++ b/backends/eds/lib/edsf-persona-store.vala @@ -416,6 +416,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore unowned string k; unowned Value? _v; bool is_fav = false; // Remember this for _set_contact_groups. + Set groups = new HashSet (); // For _set_is_favourite while (iter.next (out k, out _v) == true) { @@ -539,17 +540,17 @@ public class Edsf.PersonaStore : Folks.PersonaStore } else if (k == Folks.PersonaStore.detail_key (PersonaDetail.GROUPS)) { - Set groups = - (Set) v.get_object (); + groups = (Set) v.get_object (); this._set_contact_groups (contact, groups, is_fav); } else if (k == Folks.PersonaStore.detail_key ( PersonaDetail.IS_FAVOURITE)) { is_fav = v.get_boolean (); - // Use _set_is_favourite here to get the contact added - // to the Android "favourite" group. - this._set_is_favourite (contact, is_fav); + this._set_contact_is_favourite (contact, is_fav); + /* Ensure the contact is added to the “Starred in Android” group + * if appropriate. */ + this._set_contact_groups (contact, groups, is_fav); } } -- 2.7.4