plug memory leaks from the new strut code

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 3924a4d164a5f45837e4dc6b664682dc35cbd4bb..590c294666753c98ccd81a0b487f195029bef99a 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -183,11 +183,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
         texth = self->h - emptyy;
     h = texth * self->iconhm + emptyy;
 
-    if (self->textw) {
-        self->a_text->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
+    if (self->textw)
         textw = self->textw;
-    } else
-        self->a_text->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
 
     iconx = textx = l + ob_rr_theme->paddingx;
 
@@ -204,10 +201,10 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
     icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
 
-    /* when there is no icon and the text is not parent relative, then 
-       fill the whole dialog with the text appearance, don't use the bg at all
+    /* when there is no icon, then fill the whole dialog with the text
+       appearance
     */
-    if (!(self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL))
+    if (!self->hasicon)
     {
         textx = texty = 0;
         texth += emptyy;
@@ -284,6 +281,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
             popup_show_timeout(self);
         }
     }
+
+    g_free(area);
 }
 
 void popup_hide(ObPopup *self)