From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 25 Jan 2008 11:53:43 +0000 (+0100)
Subject: Fix some memleaks.
X-Git-Tag: backport~374
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=1d9991a0cd9b04dfa96a19bc73b40f01651de478

Fix some memleaks.

missing RrFontClose for osd_font in two places.
missing a g_free(area);
---

diff --git a/openbox/config.c b/openbox/config.c
index 56e625d..50f6aef 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -982,6 +982,7 @@ void config_shutdown(void)
     RrFontClose(config_font_inactivewindow);
     RrFontClose(config_font_menuitem);
     RrFontClose(config_font_menutitle);
+    RrFontClose(config_font_osd);
 
     for (it = config_desktops_names; it; it = g_slist_next(it))
         g_free(it->data);
diff --git a/openbox/popup.c b/openbox/popup.c
index 283348e..15d1bf5 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -257,6 +257,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     x=MAX(MIN(x, area->x+area->width-w),area->x);
     y=MAX(MIN(y, area->y+area->height-h),area->y);
 
+    g_free(area);
+
     if (m == screen_num_monitors) {
         RECT_SET(mon, x, y, w, h);
         m = screen_find_monitor(&mon);
@@ -266,6 +268,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
         x=MAX(MIN(x, area->x+area->width-w),area->x);
         y=MAX(MIN(y, area->y+area->height-h),area->y);
+
+        g_free(area);
     }
 
     /* set the windows/appearances up */
@@ -301,8 +305,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
             popup_show_timeout(self);
         }
     }
-
-    g_free(area);
 }
 
 void popup_hide(ObPopup *self)
diff --git a/render/theme.c b/render/theme.c
index 3d357e3..a57269d 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -1455,6 +1455,7 @@ void RrThemeFree(RrTheme *theme)
         RrFontClose(theme->win_font_unfocused);
         RrFontClose(theme->menu_title_font);
         RrFontClose(theme->menu_font);
+        RrFontClose(theme->osd_font);
 
         RrAppearanceFree(theme->a_disabled_focused_max);
         RrAppearanceFree(theme->a_disabled_unfocused_max);