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

[Andrea Azzarone]

Include unmapped windows in unity::bamf::Application::GetWindows too.

== Problem ==
Launcher does not show minimized update manager while clicked.

== Fix ==
Include unmapped windows in unity::bamf::Application::GetWindows too.

== Test ==
Unit test added.

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

76 +bamf_mock_window_set_transient (BamfMockWindow *self, BamfWindow* transient)
77 +{
78 + g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
79 + self->priv->transient = g_object_ref(transient);
80 +}

Mhmh... Probably it's better not to ref it here, since the parent window can be also closed... Probably it's better to add a weak ref instead.

[Andrea Azzarone (azzar1)]

> 76 +bamf_mock_window_set_transient (BamfMockWindow *self, BamfWindow*
> transient)
> 77 +{
> 78 + g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
> 79 + self->priv->transient = g_object_ref(transient);
> 80 +}
>
> Mhmh... Probably it's better not to ref it here, since the parent window can
> be also closed... Probably it's better to add a weak ref instead.

Done.

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

Ops, I think you removed too much. You still need to do
  self->priv->transient = transient;

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

Looks good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/277/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/277/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/277/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/281/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/281/console

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

> FAILED: Autolanding.
> More details in the following jenkins job:
> http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/281/
> Executed test runs:
> FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-
> autolanding/./build=pbuilder,distribution=raring,flavor=amd64/281/console
> FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-
> autolanding/./build=pbuilder,distribution=raring,flavor=i386/281/console

Are we still building with old bamf?

[Martin Mrazik (mrazik)]

Just for the reference -- yes, it was building with old bamf package. Re-approve fixed it.

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-01-03 10:25:49 +0000
+++ tests/CMakeLists.txt	2013-01-07 16:54:25 +0000
@@ -191,6 +191,7 @@
                  test_main.cpp
                  test_action_link.cpp
                  test_application_launcher_icon.cpp
+                 test_bamf_application.cpp
                  test_bfb_launcher_icon.cpp
                  test_dashview_impl.cpp
                  test_dash_controller.cpp
@@ -246,12 +247,13 @@
                  test_xdnd_manager_imp.cpp
                  test_xdnd_start_stop_notifier_imp.cpp
                  bamf-mock-application.c
+                 bamf-mock-window.c
                  gmockmount.c
                  gmockvolume.c
                  ${UNITY_SRC}/UnityShowdesktopHandler.cpp
                  ${CMAKE_SOURCE_DIR}/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
                 )
-  target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS} launcher-lib unity-shared-standalone shortcuts-lib previews-lib hud-lib switcher-lib dash-lib panel-lib)
+  target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS} launcher-lib unity-shared-bamf unity-shared-standalone shortcuts-lib previews-lib hud-lib switcher-lib dash-lib panel-lib)
   add_test(UnityGTest test-gtest)
 endif (ENABLE_X_SUPPORT)
 endif (GTEST_SRC_DIR AND
 
=== added file 'tests/bamf-mock-window.c'
--- tests/bamf-mock-window.c	1970-01-01 00:00:00 +0000
+++ tests/bamf-mock-window.c	2013-01-07 16:54:25 +0000
@@ -0,0 +1,239 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3, as
+ * published by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzaronea <andrea.azzarone@canonical>
+ *
+ */
+
+#include <glib.h>
+
+#include "bamf-mock-window.h"
+
+G_DEFINE_TYPE (BamfMockWindow, bamf_mock_window, BAMF_TYPE_WINDOW);
+
+#define BAMF_MOCK_WINDOW_GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_MOCK_WINDOW, BamfMockWindowPrivate))
+
+struct _BamfMockWindowPrivate
+{
+  BamfWindow* transient;
+  BamfWindowType window_type;
+  guint32 xid;
+  guint32 pid;
+  gint monitor;
+  GHashTable* props;
+  BamfWindowMaximizationType maximized;
+  time_t last_active;
+};
+
+void
+bamf_mock_window_set_transient (BamfMockWindow *self, BamfWindow* transient)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+
+  self->priv->transient = transient;
+  g_object_add_weak_pointer (G_OBJECT (self->priv->transient), (gpointer *) &self->priv->transient);
+}
+
+void
+bamf_mock_window_set_window_type (BamfMockWindow *self, BamfWindowType window_type)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+  self->priv->window_type = window_type;
+}
+
+void
+bamf_mock_window_set_xid (BamfMockWindow *self, guint32 xid)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+  self->priv->xid = xid;
+}
+
+void
+bamf_mock_window_set_pid (BamfMockWindow *self, guint32 pid)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+  self->priv->pid = pid;
+}
+
+void
+bamf_mock_window_set_monitor (BamfMockWindow *self, gint monitor)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+
+  if (self->priv->monitor != monitor)
+  {
+    gint old_value = self->priv->monitor;
+    self->priv->monitor = monitor;
+    g_signal_emit_by_name (G_OBJECT (self), "monitor-changed", old_value, monitor, NULL);
+  }
+}
+
+void 
+bamf_mock_window_set_utf8_prop (BamfMockWindow *self, const char* prop, const char* value)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+
+  g_hash_table_insert(self->priv->props, g_strdup(prop), g_strdup(value));
+}
+
+void
+bamf_mock_window_set_maximized (BamfMockWindow *self, BamfWindowMaximizationType maximized)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+
+  if (self->priv->maximized != maximized)
+  {
+    BamfWindowMaximizationType old_value = self->priv->maximized;
+    self->priv->maximized = maximized;
+    g_signal_emit_by_name (G_OBJECT (self), "maximized-changed", old_value, maximized, NULL);
+  }
+}
+
+void bamf_mock_window_set_last_active (BamfMockWindow *self, time_t last_active)
+{
+  g_return_if_fail (BAMF_IS_MOCK_WINDOW (self));
+  self->priv->last_active = last_active;
+}
+
+static void
+bamf_mock_window_finalize (GObject *object)
+{
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (object);
+
+  if (self->priv->transient)
+  {
+    g_object_remove_weak_pointer(G_OBJECT (self->priv->transient), (gpointer *) &self->priv->transient);
+    self->priv->transient = NULL;
+  }
+
+
+  if (self->priv->props)
+  {
+    g_hash_table_unref (self->priv->props);
+    self->priv->props = NULL;
+  }
+}
+
+static BamfWindow *
+bamf_mock_window_get_transient (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), NULL);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->transient;
+}
+
+static BamfWindowType
+bamf_mock_window_get_window_type (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), BAMF_WINDOW_NORMAL);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->window_type;
+}
+
+static guint32
+bamf_mock_window_get_xid (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), 0);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->xid;
+}
+
+static guint32
+bamf_mock_window_get_pid (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), 0);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->pid;
+}
+
+static gint
+bamf_mock_window_get_monitor (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), BAMF_WINDOW_NORMAL);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->monitor;
+}
+
+static gchar *
+bamf_mock_window_get_utf8_prop (BamfWindow *window, const char* prop)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), BAMF_WINDOW_NORMAL);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+
+  if (g_hash_table_lookup(self->priv->props, prop))
+    return g_strdup(g_hash_table_lookup(self->priv->props, prop));
+
+  return NULL;
+}
+
+static BamfWindowMaximizationType
+bamf_mock_window_maximized (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), BAMF_WINDOW_FLOATING);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->maximized;
+}
+
+static time_t
+bamf_mock_window_last_active (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_MOCK_WINDOW (window), 0);
+  BamfMockWindow *self = BAMF_MOCK_WINDOW (window);
+  return self->priv->last_active;
+} 
+
+static void
+bamf_mock_window_class_init (BamfMockWindowClass *klass)
+{
+  GObjectClass *obj_class = G_OBJECT_CLASS (klass);
+  BamfWindowClass *window_class = BAMF_WINDOW_CLASS (klass);
+
+  obj_class->finalize = bamf_mock_window_finalize;
+  window_class->get_transient = bamf_mock_window_get_transient;
+  window_class->get_window_type = bamf_mock_window_get_window_type;
+  window_class->get_xid = bamf_mock_window_get_xid;
+  window_class->get_pid = bamf_mock_window_get_pid;
+  window_class->get_monitor = bamf_mock_window_get_monitor;
+  window_class->get_utf8_prop = bamf_mock_window_get_utf8_prop;
+  window_class->maximized = bamf_mock_window_maximized;
+  window_class->last_active = bamf_mock_window_last_active;
+
+  g_type_class_add_private (obj_class, sizeof (BamfMockWindowPrivate));
+}
+
+static void
+bamf_mock_window_init (BamfMockWindow *self)
+{
+  self->priv = BAMF_MOCK_WINDOW_GET_PRIVATE (self);
+
+  self->priv->transient = NULL;
+  self->priv->window_type = BAMF_WINDOW_NORMAL;
+  self->priv->xid = 0;
+  self->priv->pid = 0;
+  self->priv->monitor = 0;
+  self->priv->props = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+  self->priv->maximized = BAMF_WINDOW_FLOATING;
+  self->priv->last_active = 0;
+}
+
+BamfMockWindow *
+bamf_mock_window_new ()
+{
+  return g_object_new (BAMF_TYPE_MOCK_WINDOW, NULL);
+}
 
=== added file 'tests/bamf-mock-window.h'
--- tests/bamf-mock-window.h	1970-01-01 00:00:00 +0000
+++ tests/bamf-mock-window.h	2013-01-07 16:54:25 +0000
@@ -0,0 +1,80 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3, as
+ * published by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#ifndef MOCK_BAMF_MOCK_WINDOW
+#define MOCK_BAMF_MOCK_WINDOW
+
+#include <time.h>
+#include <glib-object.h>
+#include <libbamf/libbamf.h>
+
+G_BEGIN_DECLS
+
+#define BAMF_TYPE_MOCK_WINDOW (bamf_mock_window_get_type ())
+
+#define BAMF_MOCK_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),\
+        BAMF_TYPE_MOCK_WINDOW, BamfMockWindow))
+
+#define BAMF_MOCK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),\
+        BAMF_TYPE_MOCK_WINDOW, BamfMockWindowClass))
+
+#define BAMF_IS_MOCK_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),\
+        BAMF_TYPE_MOCK_WINDOW))
+
+#define BAMF_IS_MOCK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),\
+        BAMF_TYPE_MOCK_WINDOW))
+
+#define BAMF_MOCK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),\
+        BAMF_TYPE_MOCK_WINDOW, BamfMockWindowClass))
+
+typedef struct _BamfMockWindow        BamfMockWindow;
+typedef struct _BamfMockWindowClass   BamfMockWindowClass;
+typedef struct _BamfMockWindowPrivate BamfMockWindowPrivate;
+
+struct _BamfMockWindow
+{
+  BamfWindow parent;
+
+  BamfMockWindowPrivate *priv;
+};
+
+struct _BamfMockWindowClass
+{
+  BamfWindowClass parent_class;
+};
+
+GType bamf_mock_window_get_type (void) G_GNUC_CONST;
+
+BamfMockWindow * bamf_mock_window_new ();
+
+void    bamf_mock_window_set_transient      (BamfMockWindow *self, BamfWindow* transient);
+void    bamf_mock_window_set_window_type    (BamfMockWindow *self, BamfWindowType window_type);
+void    bamf_mock_window_set_xid            (BamfMockWindow *self, guint32 xid);
+void    bamf_mock_window_set_pid            (BamfMockWindow *self, guint32 pid);
+void    bamf_mock_window_set_monitor        (BamfMockWindow *self, gint monitor);
+void    bamf_mock_window_set_utf8_prop      (BamfMockWindow *self, const char* prop, const char* value);
+void    bamf_mock_window_set_maximized      (BamfMockWindow *self, BamfWindowMaximizationType maximized);
+void    bamf_mock_window_set_last_active    (BamfMockWindow *self, time_t last_active);
+
+G_END_DECLS
+
+#endif
 
=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2012-12-18 17:57:48 +0000
+++ tests/mock-application.h	2013-01-07 16:54:25 +0000
@@ -139,6 +139,12 @@
   {
       return unity::ApplicationList();
   }
+
+  unity::ApplicationPtr GetApplicationForWindow(Window xid)
+  {
+    return unity::ApplicationPtr();
+  }
+
 private:
   typedef std::map<std::string, unity::ApplicationPtr> AppMap;
   AppMap app_map_;
 
=== added file 'tests/test_bamf_application.cpp'
--- tests/test_bamf_application.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_bamf_application.cpp	2013-01-07 16:54:25 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program. If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include <glib.h>
+#include <gmock/gmock.h>
+
+#include "BamfApplicationManager.h"
+#include "bamf-mock-application.h"
+#include "bamf-mock-window.h"
+#include "StandaloneWindowManager.h"
+
+#include <UnityCore/GLibWrapper.h>
+
+namespace {
+
+struct MockApplicationManager : public unity::ApplicationManager
+{
+  MOCK_METHOD0(GetActiveWindow, unity::ApplicationWindowPtr());
+  MOCK_METHOD1(GetApplicationForDesktopFile, unity::ApplicationPtr(std::string const&));
+  MOCK_METHOD0(GetRunningApplications, unity::ApplicationList());
+  MOCK_METHOD1(GetApplicationForWindow, unity::ApplicationPtr(Window));
+};
+
+unity::StandaloneWindow::Ptr AddFakeWindowToWM(Window xid, bool mapped)
+{
+  auto fake_window = std::make_shared<unity::StandaloneWindow>(xid);
+  fake_window->mapped = mapped;
+
+  unity::StandaloneWindowManager* wm = dynamic_cast<unity::StandaloneWindowManager*>(&unity::WindowManager::Default());
+  wm->AddStandaloneWindow(fake_window);
+
+  return fake_window;
+}
+
+struct TestBamfApplication : public testing::Test
+{
+  TestBamfApplication()
+    : bamf_mock_application_(bamf_mock_application_new())
+    , application_(mock_manager_, unity::glib::object_cast<BamfApplication>(bamf_mock_application_))
+  {}
+
+  MockApplicationManager mock_manager_;
+  unity::glib::Object<BamfMockApplication> bamf_mock_application_;
+  unity::bamf::Application application_;
+};
+
+TEST_F(TestBamfApplication, GetWindows)
+{
+  GList* children = nullptr;
+  for (int i = 0; i<5; ++i)
+  {
+  	BamfMockWindow* window = bamf_mock_window_new();
+  	bamf_mock_window_set_xid(window, i);
+    children = g_list_append(children, window);
+  }
+  bamf_mock_application_set_children(bamf_mock_application_, children);
+
+  AddFakeWindowToWM(0, true);
+  AddFakeWindowToWM(1, true);
+  AddFakeWindowToWM(2, false);
+  AddFakeWindowToWM(3, true);
+  AddFakeWindowToWM(4, false);
+
+  auto windows = application_.GetWindows();
+  ASSERT_EQ(windows.size(), 5);
+
+  g_list_free_full(children, g_object_unref);
+}
+
+}
 \ No newline at end of file
 
=== modified file 'unity-shared/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	2012-12-18 17:57:48 +0000
+++ unity-shared/ApplicationManager.h	2013-01-07 16:54:25 +0000
@@ -121,6 +121,9 @@
 
   virtual ApplicationList GetRunningApplications() = 0;
 
+  virtual ApplicationPtr GetApplicationForWindow(Window xid) = 0;
+
+
   sigc::signal<void, ApplicationPtr const&> application_started;
 
   sigc::signal<void, ApplicationPtr const&> active_application_changed;
 
=== modified file 'unity-shared/BamfApplicationManager.cpp'
--- unity-shared/BamfApplicationManager.cpp	2012-12-18 17:57:48 +0000
+++ unity-shared/BamfApplicationManager.cpp	2013-01-07 16:54:25 +0000
@@ -37,7 +37,7 @@
 
 // Due to the way glib handles object inheritance, we need to cast between pointer types.
 // In order to make the up-call for the base class easy, we pass through a void* for the view.
-View::View(Manager const& manager, glib::Object<BamfView> const& view)
+View::View(ApplicationManager const& manager, glib::Object<BamfView> const& view)
   : manager_(manager)
   , bamf_view_(view)
 {
@@ -81,7 +81,7 @@
 }
 
 
-WindowBase::WindowBase(Manager const& manager,
+WindowBase::WindowBase(ApplicationManager const& manager,
                        glib::Object<BamfView> const& window)
   : View(manager, window)
 {
@@ -140,7 +140,7 @@
 }
 
 
-AppWindow::AppWindow(Manager const& manager, glib::Object<BamfView> const& window)
+AppWindow::AppWindow(ApplicationManager const& manager, glib::Object<BamfView> const& window)
   : WindowBase(manager, window)
   , bamf_window_(glib::object_cast<BamfWindow>(window))
 {
@@ -161,8 +161,8 @@
 {
   // Moderately evil, but better than changing the method to non-const.
   // We know that the manager will always be able to be non-const.
-  Manager& m = const_cast<Manager&>(manager_);
-  return m.GetApplicationForWindow(bamf_window_);
+  ApplicationManager& m = const_cast<ApplicationManager&>(manager_);
+  return m.GetApplicationForWindow(window_id());
 }
 
 void AppWindow::Quit() const
@@ -170,7 +170,7 @@
   WindowManager::Default().Close(window_id());
 }
 
-Tab::Tab(Manager const& manager, glib::Object<BamfView> const& tab)
+Tab::Tab(ApplicationManager const& manager, glib::Object<BamfView> const& tab)
   : WindowBase(manager, tab)
   , bamf_tab_(glib::object_cast<BamfTab>(tab))
 {}
@@ -206,7 +206,7 @@
 }
 
 // Being brutal with this function.
-ApplicationWindowPtr create_window(Manager const& manager, glib::Object<BamfView> const& view)
+ApplicationWindowPtr create_window(ApplicationManager const& manager, glib::Object<BamfView> const& view)
 {
   ApplicationWindowPtr result;
   if (view.IsType(BAMF_TYPE_TAB))
@@ -221,14 +221,14 @@
   return result;
 }
 
-Application::Application(Manager const& manager, glib::Object<BamfView> const& app)
+Application::Application(ApplicationManager const& manager, glib::Object<BamfView> const& app)
   : View(manager, app)
   , bamf_app_(glib::object_cast<BamfApplication>(app))
 {
   HookUpEvents();
 }
 
-Application::Application(Manager const& manager, glib::Object<BamfApplication> const& app)
+Application::Application(ApplicationManager const& manager, glib::Object<BamfApplication> const& app)
   : View(manager, glib::object_cast<BamfView>(app))
   , bamf_app_(app)
 {
@@ -347,21 +347,13 @@
   if (!bamf_app_)
     return result;
 
-  WindowManager& wm = WindowManager::Default();
   std::shared_ptr<GList> children(bamf_view_get_children(bamf_view_), g_list_free);
   for (GList* l = children.get(); l; l = l->next)
   {
     glib::Object<BamfView> view(BAMF_VIEW(l->data), glib::AddRef());
     ApplicationWindowPtr window(create_window(manager_, view));
-    if (!window)
-      continue;
-
-    Window window_id = window->window_id();
-
-    if (wm.IsWindowMapped(window_id))
-    {
+    if (window)
       result.push_back(window);
-    }
   }
   return result;
 }
@@ -592,10 +584,10 @@
   return result;
 }
 
-ApplicationPtr Manager::GetApplicationForWindow(glib::Object<BamfWindow> const& window)
+ApplicationPtr Manager::GetApplicationForWindow(Window xid)
 {
   ApplicationPtr result;
-  glib::Object<BamfApplication> app(bamf_matcher_get_application_for_window(matcher_, window),
+  glib::Object<BamfApplication> app(bamf_matcher_get_application_for_xid(matcher_, xid),
                                     glib::AddRef());
   if (app)
     result.reset(new Application(*this, app));
 
=== modified file 'unity-shared/BamfApplicationManager.h'
--- unity-shared/BamfApplicationManager.h	2012-12-18 17:57:48 +0000
+++ unity-shared/BamfApplicationManager.h	2013-01-07 16:54:25 +0000
@@ -31,11 +31,10 @@
 {
 namespace bamf
 {
-class Manager;
 class View
 {
 public:
-  View(Manager const& manager,
+  View(ApplicationManager const& manager,
        glib::Object<BamfView> const& view);
 
   std::string title() const;
@@ -48,7 +47,7 @@
   bool GetUrgent() const;
 
 protected:
-  Manager const& manager_;
+  ApplicationManager const& manager_;
   glib::Object<BamfView> bamf_view_;
 };
 
@@ -56,7 +55,7 @@
 class WindowBase: public ::unity::ApplicationWindow, public View
 {
 protected:
-  WindowBase(Manager const& manager,
+  WindowBase(ApplicationManager const& manager,
              glib::Object<BamfView> const& window);
 
 public:
@@ -74,7 +73,7 @@
 class AppWindow: public WindowBase
 {
 public:
-  AppWindow(Manager const& manager,
+  AppWindow(ApplicationManager const& manager,
             glib::Object<BamfView> const& window);
 
   virtual Window window_id() const;
@@ -89,7 +88,7 @@
 class Tab: public WindowBase
 {
 public:
-  Tab(Manager const& manager,
+  Tab(ApplicationManager const& manager,
       glib::Object<BamfView> const& tab);
 
   virtual Window window_id() const;
@@ -106,9 +105,9 @@
 class Application : public ::unity::Application, public View
 {
 public:
-  Application(Manager const& manager,
+  Application(ApplicationManager const& manager,
               glib::Object<BamfView> const& app);
-  Application(Manager const& manager,
+  Application(ApplicationManager const& manager,
               glib::Object<BamfApplication> const& app);
 
   virtual std::string title() const;
@@ -149,14 +148,13 @@
   Manager();
   ~Manager();
 
-  virtual ApplicationWindowPtr GetActiveWindow();
-
-  virtual ApplicationPtr GetApplicationForDesktopFile(std::string const& desktop_file);
-
-  virtual ApplicationList GetRunningApplications();
-
-
-  virtual ApplicationPtr GetApplicationForWindow(glib::Object<BamfWindow> const& window);
+  ApplicationWindowPtr GetActiveWindow() override;
+
+  ApplicationPtr GetApplicationForDesktopFile(std::string const& desktop_file) override;
+
+  ApplicationList GetRunningApplications() override;
+
+  ApplicationPtr GetApplicationForWindow(Window xid) override;
 
 private:
   void OnViewOpened(BamfMatcher* matcher, BamfView* view);