[folks/folks-0-2] Ensure Individuals replaced due to re-linking emit removed().



commit 1d3dc6e9575251b29cb0d9a95bd03ed29b14a9de
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Oct 21 09:45:23 2010 -0700

    Ensure Individuals replaced due to re-linking emit removed().
    
    It turns out the optimization we're removing, which was meant to coalesce
    IndividualAggregator:personas-changed signal emissions, was a little
    over-reaching.
    
    Fixes bgo#632564.

 NEWS                             |    2 ++
 folks/individual-aggregator.vala |    5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index ceefc17..312e91b 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Overview of changes from libfolks 0.2.0 to libfolks 0.2.1
 Bugs fixed:
 * Bug 629642 â?? individuals-changed emitted in the wrong order
 * Bug 631864 â?? Crash when empathy disconnects
+* Bug 632564 â?? assertion `EMPATHY_IS_CONTACT (contact)' failed in
+  individual_store_contact_sort
 
 Overview of changes from libfolks 0.1.17 to libfolks 0.2.0
 ==========================================================
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 8d98a2c..c91c429 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -541,11 +541,6 @@ public class Folks.IndividualAggregator : Object
 
   private void individual_removed_cb (Individual i, Individual? replacement)
     {
-      /* Only signal if the individual is still in this.individuals. This allows
-       * us to group removals together in, e.g., personas_changed_cb(). */
-      if (this.individuals.lookup (i.id) == null)
-        return;
-
       var i_list = new GLib.List<Individual> ();
       i_list.append (i);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]