From: Dana Jansens <danakj@orodu.net>
Date: Tue, 5 Jun 2007 17:17:16 +0000 (+0000)
Subject: merge 7381 from trunk
X-Git-Tag: release-3.4.3~100
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b751a40352033fcc75692b1e033e798cc33d6473;p=dana%2Fopenbox.git

merge 7381 from trunk
---

diff --git a/openbox/popup.c b/openbox/popup.c
index a52a23db..77f751fc 100644
--- 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;