Merge lp:~unity-team/unity/unity.fix_795899 into lp:unity

[Sam Spilsbury]

Fixes some conditions that caused the property not to be updated Bug #795899

=== modified file 'scrollbars/networkarearegion/src/networkarearegion.cpp'
--- scrollbars/networkarearegion/src/networkarearegion.cpp	2011-06-06 14:17:15 +0000
+++ scrollbars/networkarearegion/src/networkarearegion.cpp	2011-06-11 11:56:37 +0000
@@ -75,8 +75,8 @@
     {
         case PropertyNotify:
 
-        if (event->xproperty.type == (int) Atoms::wmStrut ||
-            event->xproperty.type == (int) Atoms::wmStrutPartial)
+        if (event->xproperty.atom == (int) Atoms::wmStrut ||
+            event->xproperty.atom == (int) Atoms::wmStrutPartial)
         {
             CompWindow *w = screen->findWindow (event->xproperty.window);
 
@@ -88,6 +88,9 @@
 
                     w->moveNotifySetEnabled (unwmh, true);
                     w->resizeNotifySetEnabled (unwmh, true);
+
+		    /* The struts got updated, so we need to set the property again */
+		    setProperty ();
                 }
             }
         }
@@ -147,6 +150,12 @@
         WindowInterface::setHandler (w, false);
 }
 
+UnityNETWorkareaRegionWindow::~UnityNETWorkareaRegionWindow ()
+{
+    if (window->struts ())
+	UnityNETWorkareaRegionScreen::get (screen)->setProperty ();
+}
+
 bool
 UnityNETWorkareaRegionPluginVTable::init ()
 {

=== modified file 'scrollbars/networkarearegion/src/networkarearegion.h'
--- scrollbars/networkarearegion/src/networkarearegion.h	2011-06-06 14:17:15 +0000
+++ scrollbars/networkarearegion/src/networkarearegion.h	2011-06-11 11:56:37 +0000
@@ -57,6 +57,7 @@
     public:
 
         UnityNETWorkareaRegionWindow (CompWindow *);
+	~UnityNETWorkareaRegionWindow ();
 
         CompWindow *window;