Merge lp:~vanvugt/compiz/fix-1060171 into lp:compiz/0.9.9

[Daniel van Vugt]

Fix leakage of destroyed_pixmaps_table, containing pointers to freed decor_t's
which could result in a freed GHashTable being passed into g_hash_table_remove
and causing a crash.
(LP: #1060171)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3411
http://jenkins.qa.ubuntu.com/job/compiz-ci/162/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/162/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2012-09-27 09:03:24 +0000
+++ gtk/window-decorator/wnck.c	2012-10-05 03:56:23 +0000
@@ -455,12 +455,22 @@
     d->created = TRUE;
 }
 
+gboolean
+clean_destroyed_pixmaps (gpointer key, gpointer value, gpointer d)
+{
+    return value == d;
+}
+
 void
 remove_frame_window (WnckWindow *win)
 {
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     Display *xdisplay;
 
+    g_hash_table_foreach_remove (destroyed_pixmaps_table,
+                                 clean_destroyed_pixmaps,
+                                 d);
+
     xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
     if (!d->frame_window)