From f8366db42fac0641e7bf323ed0eb1bce2cbe040e Mon Sep 17 00:00:00 2001
From: Adam Endrodi <ext-adam.endrodi@nokia.com>
Date: Wed, 10 Nov 2010 14:45:05 +0200
Subject: remove MDecoratorFrame::setOnlyStatusbar()

---
 src/mcompositemanager.cpp | 17 -----------------
 src/mdecoratorframe.cpp   | 20 +++++---------------
 src/mdecoratorframe.h     |  5 -----
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp
index f450ada..eef65bb 100644
--- a/src/mcompositemanager.cpp
+++ b/src/mcompositemanager.cpp
@@ -486,7 +486,6 @@ static void fullscreen_wm_state(MCompositeManagerPrivate *priv,
             && priv->needDecoration(window, win->propertyCache())) {
             win->setDecorated(true);
             MDecoratorFrame::instance()->setManagedWindow(win);
-            MDecoratorFrame::instance()->setOnlyStatusbar(false);
             MDecoratorFrame::instance()->raise();
         } else if (win && need_geometry_modify(window) &&
                    !availScreenRect.isEmpty()) {
@@ -1224,13 +1223,10 @@ void MCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
             } else {
                 if (cw->status() == MCompositeWindow::Hung) {
                     MDecoratorFrame::instance()->setManagedWindow(cw, true);
-                    MDecoratorFrame::instance()->setOnlyStatusbar(false);
                 } else if (FULLSCREEN_WINDOW(cw) && device_state->ongoingCall()) {
                     MDecoratorFrame::instance()->setManagedWindow(cw, true);
-                    MDecoratorFrame::instance()->setOnlyStatusbar(true);
                 } else {
                     MDecoratorFrame::instance()->setManagedWindow(cw);
-                    MDecoratorFrame::instance()->setOnlyStatusbar(false);
                 }
             }
         }
@@ -1300,10 +1296,8 @@ void MCompositeManagerPrivate::configureEvent(XConfigureEvent *e)
                     item->status() != MCompositeWindow::Hung) {
                     // ongoing call case
                     MDecoratorFrame::instance()->setManagedWindow(item, true);
-                    MDecoratorFrame::instance()->setOnlyStatusbar(true);
                 } else {
                     MDecoratorFrame::instance()->setManagedWindow(item);
-                    MDecoratorFrame::instance()->setOnlyStatusbar(false);
                 }
                 MDecoratorFrame::instance()->decoratorItem()->setVisible(true);
                 MDecoratorFrame::instance()->raise();
@@ -1535,7 +1529,6 @@ void MCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
                 MDecoratorFrame::instance()->setManagedWindow(cw, true);
             } else if (FULLSCREEN_WINDOW(cw) && device_state->ongoingCall()) {
                 MDecoratorFrame::instance()->setManagedWindow(cw, true);
-                MDecoratorFrame::instance()->setOnlyStatusbar(true);
             } else
                 MDecoratorFrame::instance()->setManagedWindow(cw);
         }
@@ -2422,7 +2415,6 @@ void MCompositeManagerPrivate::rootMessageEvent(XClientMessageEvent *event)
                            && FULLSCREEN_WINDOW(ping_source)) {
                     // ongoing call decorator
                     MDecoratorFrame::instance()->setAutoRotation(false);
-                    MDecoratorFrame::instance()->setOnlyStatusbar(true);
                 }
             }
         }
@@ -2668,16 +2660,10 @@ void MCompositeManagerPrivate::activateWindow(Window w, Time timestamp,
                 // fullscreen window has decorator above it during ongoing call
                 // and when it's jammed
                 MDecoratorFrame::instance()->setManagedWindow(cw, true);
-                if (cw->status() == MCompositeWindow::Hung)
-                    MDecoratorFrame::instance()->setOnlyStatusbar(false);
-                else
-                    MDecoratorFrame::instance()->setOnlyStatusbar(true);
             } else if (cw->status() == MCompositeWindow::Hung) {
                 MDecoratorFrame::instance()->setManagedWindow(cw, true);
-                MDecoratorFrame::instance()->setOnlyStatusbar(false);
             } else {
                 MDecoratorFrame::instance()->setManagedWindow(cw);
-                MDecoratorFrame::instance()->setOnlyStatusbar(false);
             }
         }
     } else if (pc->isDecorator()) {
@@ -2735,7 +2721,6 @@ void MCompositeManagerPrivate::callOngoing(bool ongoing_call)
         if (cw && FULLSCREEN_WINDOW(cw)) {
             cw->setDecorated(true);
             MDecoratorFrame::instance()->setManagedWindow(cw, true);
-            MDecoratorFrame::instance()->setOnlyStatusbar(true);
         }
         dirtyStacking(false);
     } else {
@@ -2746,7 +2731,6 @@ void MCompositeManagerPrivate::callOngoing(bool ongoing_call)
             if (FULLSCREEN_WINDOW(i) && i->needDecoration())
                 i->setDecorated(false);
         }
-        MDecoratorFrame::instance()->setOnlyStatusbar(false);
         dirtyStacking(false);
     }
 }
@@ -3431,7 +3415,6 @@ void MCompositeManagerPrivate::gotHungWindow(MCompositeWindow *w)
 
     // own the window so we could kill it if we want to.
     MDecoratorFrame::instance()->setManagedWindow(w, true);
-    MDecoratorFrame::instance()->setOnlyStatusbar(false);
     MDecoratorFrame::instance()->setAutoRotation(true);
     dirtyStacking(false);
     MDecoratorFrame::instance()->raise();
diff --git a/src/mdecoratorframe.cpp b/src/mdecoratorframe.cpp
index 7eaeffc..f2a6079 100644
--- a/src/mdecoratorframe.cpp
+++ b/src/mdecoratorframe.cpp
@@ -131,7 +131,12 @@ void MDecoratorFrame::setManagedWindow(MCompositeWindow *cw,
 
 void MDecoratorFrame::setDecoratorWindow(Qt::HANDLE window)
 {
+    unsigned char one = 1;
     decorator_window = window;
+    XChangeProperty(QX11Info::display(), decorator_window,
+                    XInternAtom(QX11Info::display(),
+                                "_MDECORATOR_ONLY_STATUSBAR", False),
+                    XA_CARDINAL, 32, PropModeReplace, &one, 1);
     XMapWindow(QX11Info::display(), window);
 }
 
@@ -211,18 +216,3 @@ void MDecoratorFrame::setAutoRotation(bool mode)
     remote_decorator->invoke("MAbstractDecorator",
                              "RemoteSetAutoRotation", mode);
 }
-
-void MDecoratorFrame::setOnlyStatusbar(bool mode)
-{
-    if (decorator_window) {
-        long val = mode;
-        Atom a = XInternAtom(QX11Info::display(),
-                             "_MDECORATOR_ONLY_STATUSBAR", False);
-        XChangeProperty(QX11Info::display(), decorator_window, a, XA_CARDINAL,
-                        32, PropModeReplace, (unsigned char *)&val, 1);
-    }
-    /* FIXME: replaced with a window property due to reliability problems
-    remote_decorator->invoke("MAbstractDecorator",
-                             "RemoteSetOnlyStatusbar", mode);
-                             */
-}
diff --git a/src/mdecoratorframe.h b/src/mdecoratorframe.h
index afb26e3..31393ee 100644
--- a/src/mdecoratorframe.h
+++ b/src/mdecoratorframe.h
@@ -79,11 +79,6 @@ public:
      */
     void setAutoRotation(bool mode);
 
-    /*!
-     * Sets the "only statusbar" mode.
-     */
-    void setOnlyStatusbar(bool mode);
-
     /*!
      * Sets the decorator window and maps that window if it is unmapped.
      */
-- 
cgit v1.2.3