fix compiling with --disable-nls

[chaz/openbox] / src / Screen.cc

diff --git a/src/Screen.cc b/src/Screen.cc
index 175d966d82dde5673d287759a95ce9801a538559..2225e2cee73a4dd92c19611dfa23aa043c0509d5 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -653,7 +653,7 @@ Rect BScreen::availableArea() const {
       space.setH(space.h() - tbarh);
     }
 #else // !SLIT
-    int tbarh = resource.hide_toolbar() ? 0 :
+    int tbarh = resource.hide_toolbar ? 0 :
       toolbar->getExposedHeight() + resource.border_width * 2;
     switch (toolbar->placement()) {
     case Toolbar::TopLeft:
@@ -1976,11 +1976,9 @@ void BScreen::load() {
       workspacemenu->setItemSelected(current_workspace->getWorkspaceID() + 2,
                                      False);
 
-      if (openbox.focusedWindow() &&
-          openbox.focusedWindow()->getScreen() == this &&
-          (! openbox.focusedWindow()->isStuck())) {
-        openbox.focusWindow(0);
-      }
+    OpenboxWindow *fw = openbox.focusedWindow();
+    if (fw && fw->getScreen() == this)
+      openbox.focusWindow(0);
 
       current_workspace = getWorkspace(id);