diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-01-25 12:53:43 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-01-25 13:29:46 +0100 |
| commit | 1d9991a0cd9b04dfa96a19bc73b40f01651de478 (patch) | |
| tree | f7825506b70d0c09fe9b69c962cfc9f4ff7ec1aa /openbox | |
| parent | 3febcbb9ae6a31edbd64a86f0045148bb052fcff (diff) | |
Fix some memleaks.
missing RrFontClose for osd_font in two places.
missing a g_free(area);
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/config.c | 1 | ||||
| -rw-r--r-- | openbox/popup.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/openbox/config.c b/openbox/config.c index 56e625d4..50f6aef6 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 283348e7..15d1bf52 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) |