merge 7381 from trunk

diff --git a/openbox/popup.c b/openbox/popup.c
index a52a23dbe4e67ad5d7c781447aa34c41dad7e043..77f751fcf888ba77be89c7b2facaf4c359906c1f 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -185,7 +185,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     if (self->textw)
         textw = self->textw;
-    else
 
     iconx = textx = l + ob_rr_theme->paddingx;