Merge lp:~azzar1/unity/fix-914785 into lp:unity

[Andrea Azzarone]

Don't activate "home.lens" during dash closing.

== Problem ==
Hiding the dash from a lens view fades out home view.

== Fix ==
Fix the behavior of DashView::OnActivateRequest.

== Test ==
A lot of dash AP tests are failing for me (on unity trunk too). If you want to make me happy, run AP tests on this branch and let me know if there are regressions.

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

LGTM

review: Approve

[Michal Hruby (mhr3)]

Looks good on the lens side, didn't break the protocol we use. ;)

review: Approve (lens-api-calls)

=== modified file 'plugins/unityshell/src/BFBLauncherIcon.cpp'
--- plugins/unityshell/src/BFBLauncherIcon.cpp	2012-03-26 10:49:24 +0000
+++ plugins/unityshell/src/BFBLauncherIcon.cpp	2012-04-19 23:40:24 +0000
@@ -91,7 +91,7 @@
 
 void BFBLauncherIcon::ActivateLauncherIcon(ActionArg arg)
 {
-  ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", "home.lens", 0, ""));
+  ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", "home.lens", dash::NOT_HANDLED, ""));
 
   // dont chain down to avoid random dash close events
 }
 
=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-04-19 22:15:25 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-04-19 23:40:24 +0000
@@ -373,7 +373,7 @@
   std::string lens_id = view_->GetIdForShortcutActivation(std::string(key_string));
   if (lens_id != "")
   {
-    GVariant* args = g_variant_new("(sus)", lens_id.c_str(), 0, "");
+    GVariant* args = g_variant_new("(sus)", lens_id.c_str(), dash::GOTO_DASH_URI, "");
     OnActivateRequest(args);
     g_variant_unref(args);
     return true;
 
=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-04-17 07:28:31 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-04-19 23:40:24 +0000
@@ -338,12 +338,21 @@
 
   g_variant_get(args, "(sus)", &uri, &handled_type, &search_string);
 
-  std::string id = AnalyseLensURI(uri.Str());
-
-  lens_bar_->Activate(id);
-
-  if ((id == "home.lens" && handled_type != GOTO_DASH_URI ) || !visible_)
+  std::string id(AnalyseLensURI(uri.Str()));
+
+  if (!visible_)
+  {
+    lens_bar_->Activate(id);
     ubus_manager_.SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION);
+  }
+  else if (/* visible_ && */ handled_type == NOT_HANDLED)
+  {
+    ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+  }
+  else if (/* visible_ && */ handled_type == GOTO_DASH_URI)
+  {
+    lens_bar_->Activate(id);
+  }
 }
 
 std::string DashView::AnalyseLensURI(std::string const& uri)
 
=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-04-11 07:02:26 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-04-19 23:40:24 +0000
@@ -847,7 +847,7 @@
 
 void Controller::Impl::SendHomeActivationRequest()
 {
-  ubus.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", "home.lens", 0, ""));
+  ubus.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", "home.lens", dash::NOT_HANDLED, ""));
 }
 
 Controller::Controller(Display* display)