[folks] Correctly update email based im addresses during contact changes

[Raul Gutierrez Segales <raulgs src gnome org>]

commit cf255636136aab4cd6673b2d963641607fe059c9
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Oct 20 13:58:01 2011 +0200

    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

 NEWS                               |    1 +
 backends/eds/lib/edsf-persona.vala |    2 +-
 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)