metacity r3817 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Mon Aug 18 02:48:36 2008
New Revision: 3817
URL: http://svn.gnome.org/viewvc/metacity?rev=3817&view=rev

Log:
2008-08-18  Eric Piel  <e a b piel tudelft nl>

        * src/core/workspace.c (ensure_work_areas_validated): add a copy of
         each strut in a window to the workspace's strut list, instead of
         using the copy in the list (which would mean it was double-freed).
         Believed to fix #468075.



Modified:
   trunk/ChangeLog
   trunk/src/core/workspace.c

Modified: trunk/src/core/workspace.c
==============================================================================
--- trunk/src/core/workspace.c	(original)
+++ trunk/src/core/workspace.c	Mon Aug 18 02:48:36 2008
@@ -514,9 +514,12 @@
       MetaWindow *win = tmp->data;
       GSList *s_iter;
 
-      for (s_iter = win->struts; s_iter != NULL; s_iter = s_iter->next)
+      for (s_iter = win->struts; s_iter != NULL; s_iter = s_iter->next) {
+        MetaStrut *cpy = g_new (MetaStrut, 1);
+        *cpy = *((MetaStrut *)s_iter->data);
         workspace->all_struts = g_slist_prepend (workspace->all_struts,
-                                                 s_iter->data);
+                                                 cpy);
+      }
     }
   g_list_free (windows);