[mutter] frames: Fix astonishing accidental pointer trickery
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] frames: Fix astonishing accidental pointer trickery
- Date: Thu, 1 Jan 2015 06:45:27 +0000 (UTC)
commit 669c9da2a48d9a5573edee09065b8558c1d07035
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Dec 31 22:31:45 2014 -0800
frames: Fix astonishing accidental pointer trickery
Whenever we added a frame to the GHashTable, we added the frame itself
as the value, and a pointer to its storage of the frame window XID,
as the key.
When we iterated over the hash table, we actually looked up the
MetaUIFrame in the key, which might seem extraordinarily wrong, but
eagle-eyed viewers might notice that the XID is the first field in
MetaUIFrame, so the key and value are actually the same pointer.
Changing the layout of MetaUIFrame at all causes this to go haywire,
so let's not do this and simply put the MetaUIFrame in the value,
as expected.
src/ui/frames.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/ui/frames.c b/src/ui/frames.c
index ee248f2..bfcee30 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -1622,7 +1622,7 @@ find_frame_to_draw (MetaFrames *frames,
MetaUIFrame *frame;
g_hash_table_iter_init (&iter, frames->frames);
- while (g_hash_table_iter_next (&iter, (gpointer *) &frame, NULL))
+ while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &frame))
if (gtk_cairo_should_draw_window (cr, frame->window))
return frame;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]