[metacity/wip/gtk-theme: 48/51] frames: Fix astonishing accidental pointer trickery
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity/wip/gtk-theme: 48/51] frames: Fix astonishing accidental pointer trickery
- Date: Thu, 1 Jan 2015 20:43:17 +0000 (UTC)
commit dacb1557bce7e9f145307441b1d0b817808be9b7
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 96fe6bb..9aaf78b 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -2490,7 +2490,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]