Merge lp:~mhr3/libunity/filter-state-update into lp:~unity-team/libunity/libunity-7.0

[Michal Hruby]

Update filter state for all channels after a change.

Update filter state for all channels after a change.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:374
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/71/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/71/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/71/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mhr3/libunity/filter-state-update]

375. By Michal Hruby on 2013-05-01

Update symbols

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:375
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/72

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/72/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM and works fine.

review: Approve

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-04-25 16:05:20 +0000
+++ debian/libunity9.symbols	2013-05-01 21:13:26 +0000
@@ -378,6 +378,7 @@
  unity_internal_scope_channel_is_search_running@Base 0replaceme
  unity_internal_scope_channel_new@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_internal_scope_channel_register_pushed_model@Base 0replaceme
+ unity_internal_scope_channel_set_filter_base@Base 0replaceme
  unity_internal_scope_channel_new@Base 0replaceme
  unity_internal_scope_channel_set_state@Base 0replaceme
  unity_internal_scope_channel_wait_for_search@Base 0replaceme
 
=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	2013-04-30 15:58:10 +0000
+++ src/unity-aggregator-scope-private.vala	2013-05-01 21:13:26 +0000
@@ -993,6 +993,11 @@
       queue_property_notification ("Filters",
                                    new Variant.variant (this.filters));
     }
+
+    foreach (var channel in _channels.get_values ())
+    {
+      channel.set_filter_base (filters_model);
+    }
   }
 
   private void on_proxy_results_invalidated (ChannelType channel_type)
 
=== modified file 'src/unity-scope-channel.vala'
--- src/unity-scope-channel.vala	2013-04-30 15:58:10 +0000
+++ src/unity-scope-channel.vala	2013-05-01 21:13:26 +0000
@@ -152,6 +152,15 @@
     backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
     backend_model.register_vardict_schema (METADATA_COLUMN, vardict_schema);
 
+    set_filter_base (filter_model);
+
+    return swarm_name;
+  }
+
+  public void set_filter_base (Dee.SerializableModel filter_model)
+  {
+    filters = new FilterSet ();
+
     // make a copy of filter_model, and handle the filter state there
     var fm_iter = filter_model.get_first_iter ();
     var end_iter = filter_model.get_last_iter ();
@@ -161,8 +170,6 @@
       if (filter != null) filters.add (filter);
       fm_iter = filter_model.next (fm_iter);
     }
-
-    return swarm_name;
   }
 
   public unowned Filter? get_filter_by_id (string filter_id)