Merge lp:~didrocks/unity/fix-696780 into lp:unity

[Didier Roche-Tolomelli]

fix bug #696780: MAXIMIZE_STATE is a mask composed of horizontal and vertical
maximization. Do a real comparison

[Jason Smith (jassmith)]

+1

review: Approve

[Didier Roche-Tolomelli (didrocks)]

for the record:
17:52:22 Jason | didrocks, fix your spacing then merge

review: Approve

=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2010-12-17 11:02:26 +0000
+++ src/PluginAdapter.cpp	2011-01-06 16:54:11 +0000
@@ -64,12 +64,14 @@
 void
 PluginAdapter::NotifyStateChange (CompWindow *window, unsigned int state, unsigned int last_state)
 {
-  if (!(last_state & MAXIMIZE_STATE) && (state & MAXIMIZE_STATE))
+  if (!((last_state & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+      && ((state & MAXIMIZE_STATE) == MAXIMIZE_STATE))
   {
     PluginAdapter::window_maximized.emit (window);
     WindowManager::window_maximized.emit (window->id ());
   }
-  else if ((last_state & MAXIMIZE_STATE) && !(state & MAXIMIZE_STATE))
+  else if (((last_state & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+           && !((state & MAXIMIZE_STATE) == MAXIMIZE_STATE))
   {
     PluginAdapter::window_restored.emit (window);
     WindowManager::window_restored.emit (window->id ());
@@ -235,7 +237,7 @@
   window = m_Screen->findWindow (win);
   if (window)
   {
-    return window->state () & MAXIMIZE_STATE;
+    return ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE);
   }
 
   return false;