[folks] aggregator: Remove a useless duplicated set



commit 1a794bec77dbeadc0f9d7f3d5b6c6634ada26fd8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 4 17:49:26 2011 +0100

    aggregator: Remove a useless duplicated set
    
    This appears to be lingering from the dark days when we used
    GLib.List<Persona>.

 folks/individual-aggregator.vala |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 66814a3..eaaded0 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -976,7 +976,6 @@ public class Folks.IndividualAggregator : Object
       var removed_individuals = new HashSet<Individual> ();
       var individuals_changes = new HashMultiMap<Individual?, Individual?> ();
       var relinked_personas = new HashSet<Persona> ();
-      var removed_personas = new HashSet<Persona> (direct_hash, direct_equal);
       var replaced_individuals = new HashMap<Individual, Individual> ();
 
       /* We store the value of this.user locally and only update it at the end
@@ -991,10 +990,6 @@ public class Folks.IndividualAggregator : Object
           debug ("    %s (is user: %s, IID: %s)", persona.uid,
               persona.is_user ? "yes" : "no", persona.iid);
 
-          /* Build a hash table of the removed Personas so that we can quickly
-           * eliminate them from the list of Personas to relink, below. */
-          removed_personas.add (persona);
-
           /* Find the Individual containing the Persona (if any) and mark them
            * for removal (any other Personas they have which aren't being
            * removed will be re-linked into other Individuals). */
@@ -1029,7 +1024,7 @@ public class Folks.IndividualAggregator : Object
            * include any of the Personas which have just been removed. */
           foreach (var persona in individual.personas)
             {
-              if (removed_personas.contains (persona) == true ||
+              if (removed.contains (persona) == true ||
                   relinked_personas.contains (persona) == true)
                 continue;
 



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