isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid a memory leak when checking which workspace(s) a window is on. Fixes

Browse Source 
2006-02-10  Thomas Thurman <thomas thurman org uk>

	Avoid a memory leak when checking which workspace(s) a window is
	on.  Fixes #322059.

        * src/workspace.h (struct MetaWorkspace):
        * src/workspace.c (meta_workspace_new, meta_workspace_free):
	added list_containing_self member to MetaWorkspace

        * src/window.c (meta_window_get_workspaces): use
	window->workspace->list_containing_self instead of allocating (and
	leaking) such a list on the fly.
This commit is contained in:
Thomas Thurman 2006-02-11 05:06:08 +00:00 committed by Elijah Newren
parent 4b6a87acb5
commit 7aebefad3c
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2006-02-10 Thomas Thurman <thomas thurman org uk>
Avoid a memory leak when checking which workspace(s) a window is
on. Fixes #322059.
* src/workspace.h (struct MetaWorkspace):
* src/workspace.c (meta_workspace_new, meta_workspace_free):
added list_containing_self member to MetaWorkspace
* src/window.c (meta_window_get_workspaces): use
window->workspace->list_containing_self instead of allocating (and
leaking) such a list on the fly.
2006-02-09 Thomas Thurman <thomas thurman org uk> 2006-02-09 Thomas Thurman <thomas thurman org uk>
* src/testboxes.c (test_regions_okay, test_clamping_to_region): * src/testboxes.c (test_regions_okay, test_clamping_to_region):

2
src/window.c
View File

@ -5677,7 +5677,7 @@ meta_window_get_workspaces (MetaWindow *window)
if (window->on_all_workspaces) if (window->on_all_workspaces)
return window->screen->workspaces; return window->screen->workspaces;
else else
return g_list_prepend (NULL, window->workspace); return window->workspace->list_containing_self;
} }
static void static void

2
src/workspace.c
View File

@ -68,6 +68,7 @@ meta_workspace_new (MetaScreen *screen)
workspace->xinerama_region = NULL; workspace->xinerama_region = NULL;
workspace->screen_edges = NULL; workspace->screen_edges = NULL;
workspace->xinerama_edges = NULL; workspace->xinerama_edges = NULL;
workspace->list_containing_self = g_list_prepend (NULL, workspace);
workspace->all_struts = NULL; workspace->all_struts = NULL;
@ -114,6 +115,7 @@ meta_workspace_free (MetaWorkspace *workspace)
g_list_free (workspace->mru_list); g_list_free (workspace->mru_list);
g_slist_free (workspace->all_struts); g_slist_free (workspace->all_struts);
g_list_free (workspace->list_containing_self);
for (i = 0; i < screen->n_xinerama_infos; i++) for (i = 0; i < screen->n_xinerama_infos; i++)
meta_rectangle_free_list_and_elements (workspace->xinerama_region[i]); meta_rectangle_free_list_and_elements (workspace->xinerama_region[i]);

2
src/workspace.h
View File

@ -43,6 +43,8 @@ struct _MetaWorkspace
GList *windows; GList *windows;
GList *mru_list; GList *mru_list;
GList *list_containing_self;
MetaRectangle work_area_screen; MetaRectangle work_area_screen;
MetaRectangle *work_area_xinerama; MetaRectangle *work_area_xinerama;
GList *screen_region; GList *screen_region;