Merge lp:~mhr3/libunity/fix-sources-update into lp:libunity

[Michal Hruby]

Make sure all scopes are updated when the filtering state of sources filter changes

Make sure all scopes are updated when the filtering state of sources filter changes

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looking correct.

I was pondering for quite a while if we needed tests for this. I came to the conclusion that we didn't because upon inspecting the code the only line that changes the logic is an extra or-clause, which can only lead us to updating the scopes more often. Not to, fx, not updating them.

review: Approve

=== modified file 'src/unity-lens-private.vala'
--- src/unity-lens-private.vala	2012-02-28 15:03:20 +0000
+++ src/unity-lens-private.vala	2012-03-20 15:37:36 +0000
@@ -404,17 +404,22 @@
     /* this is called when unity changes the filter model */
     var temp = new CheckOptionFilter (_sources.id, _sources.display_name,
                                       _sources.icon_hint, _sources.collapsed);
+    temp.filtering = model.get_bool (iter, FilterColumn.FILTERING);
     var properties = model.get_value (iter, FilterColumn.RENDERER_STATE);
     temp.update (properties);
 
     var updated_scopes = new Gee.HashSet<string> ();
+    bool force_update = false;
+
+    /* if the filtering state was toggled, we need to update all scopes */
+    if (temp.filtering != _sources.filtering) force_update = true;
 
     /* get a list of scopes whose sources changed */
     foreach (var filter_option in temp.options)
     {
       FilterOption? current_value = _sources.get_option (filter_option.id);
       if (current_value == null) continue;
-      if (current_value.active != filter_option.active)
+      if (force_update || current_value.active != filter_option.active)
       {
         string[] tokens = filter_option.id.split (":", 2);
         updated_scopes.add (tokens[0]);