Merge lp:~mhr3/unity/no-double-activate into lp:unity

[Michal Hruby]

Don't activate a result twice after pressing Enter.

Don't activate a result twice after pressing Enter.

[Brandon Schaefer (brandontschaefer)]

After talking with Michal a test for this would be very hard, and not very safe. As it would lead to timing issue. This is a simple fix, and everything looks good... soo approved :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3363
http://jenkins.qa.ubuntu.com/job/unity-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/9

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

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-05-24 16:16:40 +0000
+++ dash/DashView.cpp	2013-06-06 15:37:34 +0000
@@ -1356,11 +1356,14 @@
   // delay the activation until we get the SearchFinished signal
   activate_on_finish_ = search_in_progress_;
 
-  activate_timeout_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
-    activate_on_finish_ = false;
-    active_scope_view_->ActivateFirst();
-    return FALSE;
-  }));
+  if (activate_on_finish_)
+  {
+    activate_timeout_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
+      activate_on_finish_ = false;
+      active_scope_view_->ActivateFirst();
+      return FALSE;
+    }));
+  }
 }
 
 // Keyboard navigation