Minor changes.

(bzr r3874.1.6)

2 files changed, 3 insertions, 3 deletions

diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp
index 75a336f65..3c7f3d4f0 100644
--- a/unity-shared/PluginAdapter.cpp
+++ b/unity-shared/PluginAdapter.cpp
@@ -1454,6 +1454,7 @@ void PluginAdapter::OnWindowClosed(CompWindow *w)
 _last_focused_window = NULL;
 }
 
+// XXX Don't use that outside lockscreen controller!
 void PluginAdapter::UnmapAllNoNuxWindowsSync()
 {
 bool one_window_is_mapped = false;
@@ -1461,7 +1462,7 @@ void PluginAdapter::UnmapAllNoNuxWindowsSync()
 {
 if (!IsNuxWindow(window) && window->isMapped())
 {
- window->unmap();
+ XUnmapWindow(m_Screen->dpy(), window->id());
 one_window_is_mapped = true;
 }
 }
diff --git a/unity-shared/PluginAdapter.h b/unity-shared/PluginAdapter.h
index e132bbbac..e5c14c7d0 100644
--- a/unity-shared/PluginAdapter.h
+++ b/unity-shared/PluginAdapter.h
@@ -194,6 +194,7 @@ public:
 Window GetTopWindowAbove(Window xid) const;
 
 void UnmapAllNoNuxWindowsSync();
+ static bool IsNuxWindow(CompWindow* value);
 
 protected:
 PluginAdapter(CompScreen* screen);
@@ -209,8 +210,6 @@ private:
 Window GetTopMostValidWindowInViewport() const;
 bool IsCurrentViewportEmpty() const;
 
- bool IsNuxWindow(CompWindow* value);
-
 CompScreen* m_Screen;
 MultiActionList m_ExpoActionList;
 MultiActionList m_ScaleActionList;