summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2011-10-20 11:58:01 (GMT)
committerRaul Gutierrez Segales <rgs@collabora.co.uk>2011-10-24 15:43:52 (GMT)
commitcf255636136aab4cd6673b2d963641607fe059c9 (patch)
treee2b0a9cc54bef4fd79b0ee0d9bfd52e6837502e1
parent965b4b47aefe8aaa62b1f8a76d1b60e8f5c1c9a8 (diff)
downloadfolks-cf255636136aab4cd6673b2d963641607fe059c9.tar.gz
folks-cf255636136aab4cd6673b2d963641607fe059c9.tar.xz
Correctly update email based im addresses during contact changes
When we have already read a contact, but are updating it e.g. due to a property change there is a problem in Edsf.Persons._update_im_addressess(). Its looking at the existing personas im_addresses for already existing im addresses before adding new ones. However, they were already added there based on the email addresses last time, which means we don't add them now. The fix is simple, just look in new_im_addressess for existing im_addresses. https://bugzilla.gnome.org/show_bug.cgi?id=662285
-rw-r--r--NEWS1
-rw-r--r--backends/eds/lib/edsf-persona.vala2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f1ded04..96eff08 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
Overview of changes from libfolks 0.6.4.1 to libfolks 0.6.5
=============================================================
Bugs fixed:
+* Bug 662285 — Error with email -> im_addresses when updating a contact
Overview of changes from libfolks 0.6.4 to libfolks 0.6.4.1
=============================================================
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index e2079d8..382a347 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -1278,7 +1278,7 @@ public class Edsf.Persona : Folks.Persona,
{
/* Has this already been added? */
var exists = false;
- var current_im_addrs = this.im_addresses.get (proto);
+ var current_im_addrs = new_im_addresses.get (proto);
if (current_im_addrs != null)
{
foreach (var cur_im in current_im_addrs)