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

stack: Don't take a weak pointer

Browse Source 
Since this is stored in an array full of data that will be copied
around, we can't rely on pointer addresses for every item in a stack
not changing.

I don't see any reason that we even have a weak pointer, either.
This code looks safe to me without it.
This commit is contained in:
Jasper St. Pierre 2013-11-19 13:08:34 -05:00
parent 9461c612de
commit 2b2b2d3191
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/stack.c
View File

@ -92,16 +92,6 @@ meta_stack_new (MetaScreen *screen)
static void static void
free_last_all_root_children_stacked_cache (MetaStack *stack) free_last_all_root_children_stacked_cache (MetaStack *stack)
{ {
unsigned int i;
for (i = 0; i < stack->last_all_root_children_stacked->len; i++)
{
MetaStackWindow *window = &g_array_index (stack->last_all_root_children_stacked, MetaStackWindow, i);
if (window->any.type == META_WINDOW_CLIENT_TYPE_WAYLAND)
g_object_remove_weak_pointer (G_OBJECT (window->wayland.meta_window),
(gpointer *)&window->wayland.meta_window);
}
g_array_free (stack->last_all_root_children_stacked, TRUE); g_array_free (stack->last_all_root_children_stacked, TRUE);
stack->last_all_root_children_stacked = NULL; stack->last_all_root_children_stacked = NULL;
} }
@ -1345,8 +1335,6 @@ stack_sync_to_xserver (MetaStack *stack)
* stale because the corresponding window has been freed we * stale because the corresponding window has been freed we
* associate a weak pointer with the new window. */ * associate a weak pointer with the new window. */
new = &g_array_index (all_root_children_stacked, MetaStackWindow, all_root_children_stacked->len - 1); new = &g_array_index (all_root_children_stacked, MetaStackWindow, all_root_children_stacked->len - 1);
g_object_add_weak_pointer (G_OBJECT (new->wayland.meta_window),
(gpointer *)&new->wayland.meta_window);
} }
} }