Merge lp:~nick-dedekind/unity/duplicate.categories into lp:unity

[Nick Dedekind]

Fixed duplicate categories in scope caused by full resync on model change.

Fixed duplicate categories in scope caused by full resync on model change.
sigc::bind not working with sigc::hide

[Michal Hruby (mhr3)]

Should fix the AP failures. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3473
http://jenkins.qa.ubuntu.com/job/unity-ci/307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/195

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

review: Approve (continuous-integration)

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2013-08-15 12:54:11 +0000
+++ dash/ScopeView.cpp	2013-08-16 10:08:24 +0000
@@ -293,18 +293,11 @@
   conn = categories->category_removed.connect(sigc::mem_fun(this, &ScopeView::OnCategoryRemoved));
   category_removed_connection_ = conn_manager_.Add(conn);
 
-  auto resync_categories = [this, categories] (bool add)
-  {
-    ClearCategories();
-    if (add)
-    {
-      for (unsigned int i = 0; i < categories->count(); ++i)
-        OnCategoryAdded(categories->RowAtIndex(i));
-    }
-  };
+  categories->model.changed.connect(sigc::hide([this]() { ClearCategories(); }));
 
-  categories->model.changed.connect(sigc::bind(sigc::hide(resync_categories), false));
-  resync_categories(true);
+  ClearCategories();
+  for (unsigned int i = 0; i < categories->count(); ++i)
+    OnCategoryAdded(categories->RowAtIndex(i));
 
   scope_->category_order.changed.connect(sigc::mem_fun(this, &ScopeView::OnCategoryOrderChanged));
 }
@@ -393,23 +386,21 @@
   conn = filters->filter_removed.connect(sigc::mem_fun(this, &ScopeView::OnFilterRemoved));
   filter_removed_connection_ = conn_manager_.Add(conn);
 
-  auto resync_filters = [this, filters] (bool add)
+  auto clear_filters = [this] ()
   {
     auto conn = conn_manager_.Get(filter_removed_connection_);
     bool blocked = conn.block(true);
 
     filter_bar_->ClearFilters();
-    if (add)
-    {
-      for (unsigned int i = 0; i < filters->count(); ++i)
-        OnFilterAdded(filters->FilterAtIndex(i));
-    }
 
     conn.block(blocked);
   };
 
-  filters->model.changed.connect(sigc::bind(sigc::hide(resync_filters), false));
-  resync_filters(true);
+  filters->model.changed.connect(sigc::hide(clear_filters));
+
+  clear_filters();
+  for (unsigned int i = 0; i < filters->count(); ++i)
+    OnFilterAdded(filters->FilterAtIndex(i));
 }
 
 void ScopeView::OnCategoryAdded(Category const& category)
@@ -425,6 +416,7 @@
 
   LOG_DEBUG(logger) << "Category added '" << (scope_ ? scope_->name() : "unknown") << "': "
                     << name
+                    << "[" << category.id() << "] "
                     << "(" << icon_hint
                     << ", " << renderer_name
                     << ", " << index << ")";