3 files changed, 6 insertions, 25 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index c538d5e..34cb829 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -294,7 +294,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
     show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"),
     auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"),
     click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"),
-    decorate_transient(rm, true, scrname+".decorateTransient", altscrname+".DecorateTransient"),
     default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"),
     rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
     tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
@@ -1810,9 +1809,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
               "Workspace Warping",
               "Workspace Warping - dragging windows to the edge and onto the next workspace",
               resource.workspace_warping, saverc_cmd);
-    _BOOLITEM(menu, Configmenu, DecorateTransient,
-              "Decorate Transient Windows", "Decorate Transient Windows",
-              resource.decorate_transient, saverc_cmd);
     _BOOLITEM(menu, Configmenu, ClickRaises,
               "Click Raises", "Click Raises",
               resource.click_raises, saverc_cmd);
diff --git a/src/Screen.hh b/src/Screen.hh
index 2cd9ca9..9800d19 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -118,7 +118,6 @@ public:
     bool getMaxDisableMove() const { return *resource.max_disable_move; }
     bool getMaxDisableResize() const { return *resource.max_disable_resize; }
     bool doShowWindowPos() const { return *resource.show_window_pos; }
-    bool decorateTransient() const { return *resource.decorate_transient; }
     const std::string &defaultDeco() const { return *resource.default_deco; }
     const std::string windowMenuFilename() const;
     FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
@@ -552,8 +551,7 @@ private:
 
         FbTk::Resource<bool> opaque_move, full_max,
             max_ignore_inc, max_disable_move, max_disable_resize,
-            workspace_warping, show_window_pos, auto_raise, click_raises,
-            decorate_transient;
+            workspace_warping, show_window_pos, auto_raise, click_raises;
         FbTk::Resource<std::string> default_deco;
         FbTk::Resource<std::string> rootcommand;
         FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;
diff --git a/src/Window.cc b/src/Window.cc
index 98c10f4..8f97954 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -441,15 +441,8 @@ void FluxboxWindow::init() {
     /* Read state above here, apply state below here. */
     /**************************************************/
 
-    if (m_client->isTransient()) {
-        if (m_client->transientFor()->fbwindow())
-            stuck = m_client->transientFor()->fbwindow()->isStuck();
-
-        if (!screen().decorateTransient()) {
-            decorations.maximize =  functions.maximize = false;
-            decorations.handle = false;
-        }
-    }
+    if (m_client->isTransient() && m_client->transientFor()->fbwindow())
+        stuck = m_client->transientFor()->fbwindow()->isStuck();
 
     if (!m_client->sizeHints().isResizable()) {
         functions.resize = functions.maximize = false;
@@ -2188,18 +2181,12 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
                 if (functions.resize ||
                     functions.maximize)
                     changed = true;
-                functions.resize=false;
-                functions.maximize=false;
+                functions.resize = functions.maximize = false;
             } else {
                 // TODO: is broken while handled by FbW, needs to be in WinClient
-                if (!client.isTransient() || screen().decorateTransient()) {
-                    if (!functions.maximize)
-                        changed = true;
-                    functions.maximize = true;
-                }
-                if (!functions.resize)
+                if (!functions.maximize || !functions.resize)
                     changed = true;
-                functions.resize = true;
+                functions.maximize = functions.resize = true;
             }
 
             if (changed) {