← Back to branch summary

~townsend/unity/fix-waiting-to-install

« back to all changes in this revision

Viewing changes to dash/DashView.cpp

  • Committer: Chris Townsend
  • Date: 2013-07-17 16:24:40 UTC
  • mfrom: (3379.1.48 trunk)
  • Revision ID: christopher.townsend@canonical.com-20130717162440-zbeyzlbq0kdvnypo
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/DashView.cpp
165
165
 
166
166
DashView::~DashView()
167
167
{
168
 
  scope_can_refine_connection_.disconnect();
169
 
  key_nav_focus_change_connection_.disconnect();
170
 
 
171
168
  // Do this explicitely, otherwise dee will complain about invalid access
172
169
  // to the scope models
173
170
  RemoveLayout();
1236
1233
  scopes_layout_->AddView(view.GetPointer(), 1);
1237
1234
  scope_views_[scope->id] = view;
1238
1235
 
 
1236
  // set form factor used for the searches
 
1237
  scope->form_factor = "desktop";
1239
1238
  scope->activated.connect(sigc::mem_fun(this, &DashView::OnResultActivatedReply));
1240
1239
  scope->connected.changed.connect([&] (bool value) { });
1241
1240
 
1268
1267
 
1269
1268
  if (active_scope_view_.IsValid())
1270
1269
    active_scope_view_->SetVisible(false);
1271
 
  scope_can_refine_connection_.disconnect();
1272
1270
 
1273
1271
  nux::ObjectPtr<ScopeView> view = active_scope_view_ = scope_views_[id];
1274
1272