Merge lp:~unity-team/unity/changeset-demultiplexer into lp:unity

[Nick Dedekind]

Set a demultiplexer for the result filter model.

Set a demultiplexer for the result filter model.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3603
http://jenkins.qa.ubuntu.com/job/unity-ci/515/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/49/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/515/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Hi Nick,

There really is no context on what this change is for wrt to dee. I don't see an associated bug either to help figure this out. Could you provide some background and/or possibly a bug for our review?

review: Needs Information

[Michal Hruby (mhr3)]

Sorry, we were just talking with Nick about this, opened a proper bug and linked it to this.

[Christopher Townsend (townsend)]

Ok, this looks sane after reviewing the bug and the changes in dee. I'm not familiar with dee, so I'm probably the wrong person to review that MP. That said, I'll locally approve this until the dee MP is merged and then we can get this into Unity.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

dee_filter_model_set_multiplexer(DEE_FILTER_MODEL (filter_model.RawPtr()), pimpl->demultiplexer_.RawPtr());

Using glib::object_cast would be nicer... :P
RawPtr() shouldn't be needed, as the casting is implicit.

Unmerged revisions

3603. By Nick Dedekind on 2013-11-22

Use demultiplexer in results filter models.

=== modified file 'UnityCore/ScopeProxy.cpp'
--- UnityCore/ScopeProxy.cpp	2013-11-01 07:24:38 +0000
+++ UnityCore/ScopeProxy.cpp	2013-11-22 14:44:17 +0000
@@ -98,6 +98,7 @@
   Results::Ptr results_;
   Filters::Ptr filters_;
   Categories::Ptr categories_;
+  glib::Object<DeeChangesetDemultiplexer> demultiplexer_;
 
   connection::handle filters_change_connection_;
   connection::Manager signals_conn_;
@@ -259,6 +260,7 @@
 , results_(new Results())
 , filters_(new Filters())
 , categories_(new Categories())
+, demultiplexer_(dee_changeset_demultiplexer_new())
 {
   // remote properties
   signals_conn_.Add(utils::ConnectProperties(owner_->connected, connected));
@@ -813,6 +815,7 @@
   DeeFilter filter;
   pimpl->GetFilterForCategory(category, &filter);
   glib::Object<DeeModel> filter_model(dee_filter_model_new(all_results->model(), &filter));
+  dee_filter_model_set_multiplexer(DEE_FILTER_MODEL (filter_model.RawPtr()), pimpl->demultiplexer_.RawPtr());
 
   auto func = [all_results](glib::Object<DeeModel> const& model) { return all_results->GetTag(); };
   

=== modified file 'debian/control'
--- debian/control	2013-11-07 13:54:18 +0000
+++ debian/control	2013-11-22 14:44:17 +0000
@@ -20,7 +20,7 @@
                libdbus-1-dev,
                libcompizconfig0-dev (>= 1:0.9.11),
                libdbusmenu-glib-dev (>= 0.3.91),
-               libdee-dev (>= 1.2.6),
+               libdee-dev (>= 1.2.7),
                libgee-dev (>= 0.5.0),
                libgeis-dev (>= 2.0.10),
                libgl1-mesa-dri,
@@ -150,7 +150,7 @@
          libsigc++-2.0-dev,
          libnux-4.0-dev (>= 4.0.4),
          libunity-dev (>= 7.1.0~),
-         libdee-dev,
+         libdee-dev (>= 1.2.7),
 Description: Core library for the Unity interface - development files
  Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
  community, Unity is all about the combination of familiarity and the future. We