[folks] Fix an assertion error in IndividualAggregator



commit 1752549c7c0dacfc465cf727b8074cbe519d1a2f
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Tue Sep 21 11:32:22 2010 +0100

    Fix an assertion error in IndividualAggregator
    
    Due to the order in which the aggregation functions are called, it's possible
    for this.user to not be null when a new user is set. Helps: bgo#627402

 folks/individual-aggregator.vala |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 89fa44c..9ae0e84 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -417,10 +417,7 @@ public class Folks.IndividualAggregator : Object
 
           /* If the final Individual is the user, set them as such. */
           if (final_individual.is_user == true)
-            {
-              assert (this.user == null);
-              this.user = final_individual;
-            }
+            this.user = final_individual;
 
           /* Add the new Individual to the aggregator */
           final_individual.removed.connect (this.individual_removed_cb);



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