Merge branch 'backport' into work

Conflicts:

	openbox/grab.c
	openbox/keyboard.c

1 files changed, 3 insertions, 7 deletions

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 3328a1b2..df36c8c3 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -349,14 +349,10 @@ static void prompt_resize(ObPrompt *self, gint w, gint h)
 static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
                                    gboolean on)
 {
-    gint l, r, t, b;
-
-    if (!on) {
-        gint i;
+    gint i, l, r, t, b;
 
-        for (i = 1; i < 5; ++i)
-            a->texture[i].type = on ? RR_TEXTURE_LINE_ART : RR_TEXTURE_NONE;
-    }
+    for (i = 1; i < 5; ++i)
+        a->texture[i].type = on ? RR_TEXTURE_LINE_ART : RR_TEXTURE_NONE;
 
     if (!on) return;