Merged window-manager-refactor into refactor-keyboard-funcs.

(bzr r2791.5.3)

3 files changed, 7 insertions, 7 deletions

diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp
index 8aa4c3723..a49a0a9b9 100644
--- a/unity-shared/PluginAdapter.cpp
+++ b/unity-shared/PluginAdapter.cpp
@@ -1006,7 +1006,7 @@ void PluginAdapter::SetMwmWindowHints(Window xid, MotifWmHints* new_hints)
 XFree(data);
 }
 
-void PluginAdapter::Decorate(Window window_id)
+void PluginAdapter::Decorate(Window window_id) const
 {
 MotifWmHints hints = { 0 };
 
@@ -1016,7 +1016,7 @@ void PluginAdapter::Decorate(Window window_id)
 SetMwmWindowHints(window_id, &hints);
 }
 
-void PluginAdapter::Undecorate(Window window_id)
+void PluginAdapter::Undecorate(Window window_id) const
 {
 MotifWmHints hints = { 0 };
 
@@ -1301,4 +1301,4 @@ std::string PluginAdapter::GetTextProperty(Window window_id, Atom atom) const
 return retval;
 }
 
-}
+} // namespace unity
diff --git a/unity-shared/PluginAdapter.h b/unity-shared/PluginAdapter.h
index 8f09bf3f7..c91855e63 100644
--- a/unity-shared/PluginAdapter.h
+++ b/unity-shared/PluginAdapter.h
@@ -121,8 +121,8 @@ public:
 
 Window GetActiveWindow() const;
 
- void Decorate(Window xid);
- void Undecorate(Window xid);
+ void Decorate(Window xid) const;
+ void Undecorate(Window xid) const;
 
 // WindowManager implementation
 bool IsWindowMaximized(Window window_id) const;
diff --git a/unity-shared/WindowManager.h b/unity-shared/WindowManager.h
index 17186b424..b9a7c7e42 100644
--- a/unity-shared/WindowManager.h
+++ b/unity-shared/WindowManager.h
@@ -105,8 +105,8 @@ public:
 virtual bool ScaleWindowGroup(std::vector<Window> const& windows,
 int state, bool force) = 0;
 
- virtual void Decorate(Window window_id) {};
- virtual void Undecorate(Window window_id) {};
+ virtual void Decorate(Window window_id) const {};
+ virtual void Undecorate(Window window_id) const {};
 
 virtual bool IsScreenGrabbed() const = 0;
 virtual bool IsViewPortSwitchStarted() const = 0;