[Xfce4-commits] r25774 - xfwm4/branches/xfce_4_4/src

[Olivier Fourdan]

Author: olivier
Date: 2007-06-03 00:00:04 +0000 (Sun, 03 Jun 2007)
New Revision: 25774

Modified:
   xfwm4/branches/xfce_4_4/src/client.c
   xfwm4/branches/xfce_4_4/src/settings.c
Log:
Leak fix (backported from a patch by Phil Vandry <vandry at tzone.org>)

Modified: xfwm4/branches/xfce_4_4/src/client.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/client.c	2007-06-02 23:52:19 UTC (rev 25773)
+++ xfwm4/branches/xfce_4_4/src/client.c	2007-06-03 00:00:04 UTC (rev 25774)
@@ -2149,10 +2149,10 @@
     xfwmWindowDelete (&c->sides[SIDE_LEFT]);
     xfwmWindowDelete (&c->sides[SIDE_RIGHT]);
     xfwmWindowDelete (&c->sides[SIDE_BOTTOM]);
-    xfwmWindowDelete (&c->sides[CORNER_BOTTOM_LEFT]);
-    xfwmWindowDelete (&c->sides[CORNER_BOTTOM_RIGHT]);
-    xfwmWindowDelete (&c->sides[CORNER_TOP_LEFT]);
-    xfwmWindowDelete (&c->sides[CORNER_TOP_RIGHT]);
+    xfwmWindowDelete (&c->corners[CORNER_BOTTOM_LEFT]);
+    xfwmWindowDelete (&c->corners[CORNER_BOTTOM_RIGHT]);
+    xfwmWindowDelete (&c->corners[CORNER_TOP_LEFT]);
+    xfwmWindowDelete (&c->corners[CORNER_TOP_RIGHT]);
 
     xfwmPixmapFree (&c->appmenu[ACTIVE]);
     xfwmPixmapFree (&c->appmenu[INACTIVE]);

Modified: xfwm4/branches/xfce_4_4/src/settings.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/settings.c	2007-06-02 23:52:19 UTC (rev 25773)
+++ xfwm4/branches/xfce_4_4/src/settings.c	2007-06-03 00:00:04 UTC (rev 25774)
@@ -1597,7 +1597,7 @@
         xfwmPixmapFree (&screen_info->corners[i][ACTIVE]);
         xfwmPixmapFree (&screen_info->corners[i][INACTIVE]);
     }
-    for (i = 0; i < BUTTON_LAST; i++)
+    for (i = 0; i < BUTTON_COUNT; i++)
     {
         xfwmPixmapFree (&screen_info->buttons[i][ACTIVE]);
         xfwmPixmapFree (&screen_info->buttons[i][INACTIVE]);