merge r6295 from trunk

diff --git a/openbox/popup.c b/openbox/popup.c
index f341e0922dd543501e555875c032f0266ea23d17..5c96f073a90b71d68ac449c0bdf605eff33e8714 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -169,11 +169,9 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     /* get the height, which is also used for the icon width */
     emptyy = t + b + ob_rr_theme->paddingy * 2;
-    if (self->h) {
-        h = self->h;
-        texth = h - emptyy;
-    } else
-        h = texth * self->iconhm + emptyy;
+    if (self->h)
+        texth = self->h - emptyy;
+    h = texth * self->iconhm + emptyy;
 
     if (self->textw)
         textw = self->textw;