From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 16:23:50 +0000 (+0000)
Subject: merge r6295 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~110
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a7a1ae43500ac26c3e17c3268ec5f35603b2439a;p=dana%2Fopenbox-history.git

merge r6295 from trunk
---

diff --git a/openbox/popup.c b/openbox/popup.c
index f341e092..5c96f073 100644
--- 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;