Merge lp:~mhr3/unity/fix-947301 into lp:unity

[Michal Hruby]

== The Problem ==
Crashed lens doesn't restart unless searching in home view.

== The Solution ==
Make sure a Search call can restart a lens just as GlobalSearch can.

== Testing ==
Added a manual test for the issue.

[Gord Allott (gordallott)]

works but killall unity-applications-daemon won't work for precice unity, killall can't find it. requires
killall /usr/lib/unity-lens-applications/unity-applications-daemon

so the manual test needs to be fixed up

review: Needs Fixing

[Gord Allott (gordallott)]

+1

review: Approve

[Mirco Müller (macslow)]

I've been able to reproduce your manual-test, but on my system I've to use:

  killall unity-applicati

The reason for this truncated process-name currently escapes me. If I do the stated:

  killall unity-applications-daemon

... I get the response that a process with that name could not be found. Any idea?

[Mirco Müller (macslow)]

Since this seems to be a current (but odd) feature of Precise and not only happening on my system I'm good with approving your branch.

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

I always use pkill instead of killall. Just 'pkill -f
unity-applications-daemon'. That definitely works. This reminds me
that we should really add a --replace switch to all dameons. Oh, have
I missed that a gajillion times or more!

=== modified file 'UnityCore/HomeLens.cpp'
--- UnityCore/HomeLens.cpp	2012-01-26 08:20:58 +0000
+++ UnityCore/HomeLens.cpp	2012-03-06 13:23:18 +0000
@@ -770,7 +770,7 @@
       if (running_searches_ <= 0)
       {
         owner_->search_finished.emit(Hints());
-        LOG_DEBUG(logger) << "Search finished";
+        LOG_INFO(logger) << "Search finished";
       }
   });
 
@@ -911,7 +911,7 @@
   {
     if (lens->search_in_global())
     {
-      LOG_DEBUG(logger) << " - Global search on '" << lens->id() << "' for '"
+      LOG_INFO(logger) << " - Global search on '" << lens->id() << "' for '"
           << search_string << "'";
       lens->view_type = ViewType::HOME_VIEW;
       lens->GlobalSearch(search_string);

=== modified file 'UnityCore/Lens.cpp'
--- UnityCore/Lens.cpp	2012-02-04 05:28:23 +0000
+++ UnityCore/Lens.cpp	2012-03-06 13:23:18 +0000
@@ -456,9 +456,9 @@
 {
   LOG_DEBUG(logger) << "Searching '" << id_ << "' for '" << search_string << "'";
 
-  if (!proxy_->IsConnected())
+  if (proxy_ == NULL)
   {
-    LOG_DEBUG(logger) << "Skipping search. Proxy not connected. ('" << id_ << "')";
+    LOG_DEBUG(logger) << "Skipping search. Proxy not initialized. ('" << id_ << "')";
     return;
   }
 

=== added file 'manual-tests/Lenses.txt'
--- manual-tests/Lenses.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/Lenses.txt	2012-03-06 13:23:18 +0000
@@ -0,0 +1,15 @@
+Restarting of crashed lenses
+----------------------------
+This test makes sure that if a lens crashes, searching in the dash
+automatically restarts it.
+
+#. Open a terminal
+#. Make sure there are some results in the apps lens
+#. Kill the applications lens daemon in the terminal
+   `killall /usr/lib/unity-lens-applications/unity-applications-daemon`
+#. Open the dash and search for something (for example "gedit")
+
+Outcome
+Applications lens should automatically restart and gedit should be visible
+in the results.
+

=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp	2012-02-21 20:10:05 +0000
+++ plugins/unityshell/src/LensView.cpp	2012-03-06 13:23:18 +0000
@@ -402,7 +402,7 @@
   if (view_type != HIDDEN && initial_activation_)
   {
     /* We reset the lens for ourselves, in case this is a restart or something */
-    lens_->Search("");
+    lens_->Search(search_string);
     initial_activation_ = false;
   }