Merge lp:~seb128/unity/1164915-fix into lp:unity

[Sebastien Bacher]

Revert r3266 "Don't close the dash when switching from the command lens to the home lens.", it's breaking dash closing for individual lens, which also result in a serie of failing tests (lp: #1164915)

Revert r3266 "Don't close the dash when switching from the command lens to the home lens.", it's breaking dash closing for individual lens, which also result in a serie of failing tests (lp: #1164915)

[Didier Roche-Tolomelli (didrocks)]

Thanks for the revert!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-04 17:42:29 +0000
+++ dash/DashView.cpp	2013-04-05 09:53:27 +0000
@@ -1135,15 +1135,8 @@
   }
   else if (/* visible_ && */ handled_type == NOT_HANDLED)
   {
-    if (lens_bar_->GetActiveLensId() != id)
-    {
-      lens_bar_->Activate(id);
-    }
-    else
-    {
-      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
-                                glib::Source::Priority::HIGH);
-    }
+    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
+                              glib::Source::Priority::HIGH);
   }
   else if (/* visible_ && */ handled_type == GOTO_DASH_URI)
   {
 
=== modified file 'dash/LensBar.h'
--- dash/LensBar.h	2013-03-29 17:21:37 +0000
+++ dash/LensBar.h	2013-04-05 09:53:27 +0000
@@ -61,8 +61,6 @@
   void Activate(std::string id);
   void ActivateNext();
   void ActivatePrevious();
-  
-  std::string GetActiveLensId() const;
 
   sigc::signal<void, std::string const&> lens_activated;
 
@@ -83,6 +81,7 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
+  std::string GetActiveLensId() const;
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
 
   LensIcons icons_;
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-04-02 16:52:38 +0000
+++ debian/changelog	2013-04-05 09:53:27 +0000
@@ -1,8 +1,14 @@
 unity (7.0.0-0ubuntu1) UNRELEASED; urgency=low
 
+  * Revert r3266 "Don't close the dash when switching from the command lens 
+    to the home lens.", it's breaking dash closing for individual lens,
+    which also result in a serie of failing tests (lp: #1164915)
+
+  [ Stephen M. Webb ]
   * Bumped released version to 7.0.0
 
- -- Stephen M. Webb <[e-mail]>  Tue, 02 Apr 2013 12:51:28 -0400
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 05 Apr 2013 11:46:59 +0200
 
 unity (6.12.0daily13.04.01-0ubuntu1) raring; urgency=low
 
 
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-04-04 17:42:29 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-04-05 09:53:27 +0000
@@ -76,18 +76,8 @@
         """Switch to command lens without closing the dash."""
         self.unity.dash.ensure_visible()
         self.unity.dash.reveal_command_lens()
-        self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
         self.assertThat(self.unity.dash.active_lens, Eventually(Equals('commands.lens')))
 
-    def test_can_go_from_command_lens_to_dash(self):
-        """We must be able to go from the command lens to the dash (home lens)."""
-        self.unity.dash.reveal_command_lens()
-
-        # Since the dash is visible we can't use ensure_visible().
-        self.keybinding("dash/reveal", 0.1)
-        self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
-        self.assertThat(self.unity.dash.active_lens, Eventually(Equals('home.lens')))
-
     def test_alt_f4_close_dash(self):
         """Dash must close on alt+F4."""
         self.unity.dash.ensure_visible()