diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-03 01:29:40 +0800 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-03 17:37:42 +0800 |
| commit | acc539549da986e0cfb4dd29142dcdf34743ce7d (patch) | |
| tree | ed3a51230874ec1da1bf91a3f002a1e8a2150455 | |
| parent | 737212cbc975c9113f4aaf105fb765811805c54a (diff) | |
| download | gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.tar gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.tar.gz gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.tar.bz2 gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.tar.lz gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.tar.xz gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.tar.zst gsoc2013-empathy-acc539549da986e0cfb4dd29142dcdf34743ce7d.zip | |
Ensure contacts have a persona set
Ensure that contacts created by empathy_contact_dup_from_folks_individual()
have a persona set, so that things like custom presence messages in contact
tooltips work again. This requires that we don't set the alias on the
contacts during the initial contact population period, or we'll end up with
duplicates of each contact in the list. Closes: bgo#625828
| -rw-r--r-- | libempathy/empathy-contact.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 5b6e3345d..df8a1ffe4 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -849,7 +849,8 @@ empathy_contact_set_persona (EmpathyContact *contact, /* Set the persona's alias, since ours could've been set using * empathy_contact_set_alias() before we had a persona; this happens when * adding a contact. */ - empathy_contact_set_alias (contact, priv->alias); + if (priv->alias != NULL) + empathy_contact_set_alias (contact, priv->alias); /* Set the persona's groups */ if (priv->groups != NULL) diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 9a5e28c17..49df14b41 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -615,6 +615,7 @@ empathy_contact_dup_from_folks_individual (FolksIndividual *individual) tp_contact = tpf_persona_get_contact (persona); contact = empathy_contact_dup_from_tp_contact (tp_contact); + empathy_contact_set_persona (contact, FOLKS_PERSONA (persona)); } } |