Merge lp:~veebers/unity/fix-950782 into lp:unity

[Christopher Lee]

Adding test for fix-950782, Application switching (Alt+tab) no longer updates panel menu titles.

I removed the ubus registration and related callback for the "workspace switch selection changed" from the panel menu view.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve (quality)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2012-07-30 17:09:43 +0000
+++ panel/PanelMenuView.cpp	2012-08-22 04:35:23 +0000
@@ -152,7 +152,6 @@
   _titlebar_grab_area->mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
 
   _ubus_manager.RegisterInterest(UBUS_SWITCHER_SHOWN, sigc::mem_fun(this, &PanelMenuView::OnSwitcherShown));
-  _ubus_manager.RegisterInterest(UBUS_SWITCHER_SELECTION_CHANGED, sigc::mem_fun(this, &PanelMenuView::OnSwitcherSelectionChanged));
 
   _ubus_manager.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavStarted));
   _ubus_manager.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavEnded));
@@ -1552,18 +1551,6 @@
   QueueDraw();
 }
 
-void PanelMenuView::OnSwitcherSelectionChanged(GVariant* data)
-{
-  if (!data || !_switcher_showing)
-    return;
-
-  const gchar *title = g_variant_get_string(data, 0);
-  _panel_title = (title ? title : "");
-
-  Refresh();
-  QueueDraw();
-}
-
 void PanelMenuView::OnLauncherKeyNavStarted(GVariant* data)
 {
   if (_launcher_keynav)

=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2012-06-18 02:57:23 +0000
+++ panel/PanelMenuView.h	2012-08-22 04:35:23 +0000
@@ -113,7 +113,6 @@
   std::string GetActiveViewName(bool use_appname = false) const;
 
   void OnSwitcherShown(GVariant* data);
-  void OnSwitcherSelectionChanged(GVariant* data);
   void OnLauncherKeyNavStarted(GVariant* data);
   void OnLauncherKeyNavEnded(GVariant* data);
   void OnLauncherSelectionChanged(GVariant* data);

=== modified file 'tests/autopilot/unity/tests/test_panel.py'
--- tests/autopilot/unity/tests/test_panel.py	2012-08-09 17:12:10 +0000
+++ tests/autopilot/unity/tests/test_panel.py	2012-08-22 04:35:23 +0000
@@ -206,6 +206,19 @@
         self.assertThat(lambda: text_win.title, Eventually(NotEquals(old_title)))
         self.assertThat(self.panel.title, Eventually(Equals(text_win.title)))
 
+    def test_panel_title_doesnt_change_with_switcher(self):
+        """Switching between apps must not change the Panels title."""
+        calc_win = self.open_new_application_window("Calculator")
+        text_win = self.open_new_application_window("Text Editor")
+        current_title = self.panel.title
+
+        self.switcher.initiate()
+        self.addCleanup(self.switcher.terminate)
+        self.switcher.next_icon()
+
+        self.assertThat(self.panel.title,
+                        Eventually(Equals(current_title)))
+
 
 class PanelWindowButtonsTests(PanelTestsBase):