Merge lp:~mhr3/libunity/sources-filtering into lp:libunity

[Michal Hruby]

Make sure the filtering property is updated on scopes' sources filter, so it's consistent with other filters.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Aha, good catch!

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/30/console reported an error when processing this lp:~mhr3/libunity/sources-filtering branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/35/console reported an error when processing this lp:~mhr3/libunity/sources-filtering branch.
Not merging it.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Let me try an approve again to see if Dee trunk makes stuff work again. (at least, it fixes the variant ref counting issue for me)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/39/console reported an error when processing this lp:~mhr3/libunity/sources-filtering branch.
Not merging it.

=== modified file 'src/unity-scope-private.vala'
--- src/unity-scope-private.vala	2012-01-09 15:32:37 +0000
+++ src/unity-scope-private.vala	2012-01-11 10:55:52 +0000
@@ -173,9 +173,13 @@
 
   private void on_filter_added (Dee.Model model, Dee.ModelIter iter)
   {
-    /* we don't care about sources filter, it's handled separately */
     if (model.get_string (iter, FilterColumn.ID) == Lens.SOURCES_FILTER_ID)
+    {
+      /* just make sure we directly update the properties on scope.sources
+       * filter, the options are handled separately */
+      _owner.sources.filtering = model.get_bool (iter, FilterColumn.FILTERING);
       return;
+    }
 
     string icon_hint_s = model.get_string (iter, FilterColumn.ICON_HINT);
 
@@ -229,9 +233,13 @@
 
   private void on_filter_changed (Dee.Model model, Dee.ModelIter iter)
   {
-    /* we don't care about sources filter, it's handled separately */
     if (model.get_string (iter, FilterColumn.ID) == Lens.SOURCES_FILTER_ID)
+    {
+      /* just make sure we directly update the properties on scope.sources
+       * filter, the options are handled separately */
+      _owner.sources.filtering = model.get_bool (iter, FilterColumn.FILTERING);
       return;
+    }
 
     queue_filters_changed ();
   }