migrate patches from trunk

2 files changed, 4 insertions, 2 deletions

diff --git a/src/Window.cc b/src/Window.cc
index b0aa678..b9ef2ff 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2400,8 +2400,10 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
                 functions.resize = true;
             }
 
-            if (changed)
+            if (changed) {
                 setupWindow();
+                applyDecorations();
+            }
        }
 
         moveResize(frame().x(), frame().y(),
diff --git a/src/main.cc b/src/main.cc
index 4554123..e4e16ac 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -222,7 +222,7 @@ int main(int argc, char **argv) {
             }
         } else if (arg == "-version" || arg == "-v") {
             // print current version string
-            cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Henrik Kinnunen " << endl << endl;
+            cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Fluxbox Team " << endl << endl;
             exit(EXIT_SUCCESS);
         } else if (arg == "-log") {
             if (++i >= argc) {