Author: jannis
Date: 2008-07-16 19:59:26 +0000 (Wed, 16 Jul 2008)
New Revision: 27318

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/xfce4-settings-helper/accessx.c
   xfce4-settings/trunk/xfce4-settings-helper/xkb.c
Log:
        * xfce4-settings-helper/accessx.c, xfce4-settings-helper/xkb.c: Call
          XkbFreeControls prior to XkbFree. This should fix two memory leaks
          and hopefully doesn't break anything.

Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog      2008-07-16 19:48:55 UTC (rev 27317)
+++ xfce4-settings/trunk/ChangeLog      2008-07-16 19:59:26 UTC (rev 27318)
@@ -1,5 +1,11 @@
 2008-07-16     Jannis Pohlmann <[EMAIL PROTECTED]>
 
+       * xfce4-settings-helper/accessx.c, xfce4-settings-helper/xkb.c: Call
+         XkbFreeControls prior to XkbFree. This should fix two memory leaks
+         and hopefully doesn't break anything.
+
+2008-07-16     Jannis Pohlmann <[EMAIL PROTECTED]>
+
        * dialogs/keyboard-settings/main.c: Save property when a new shortcut
          is created.
 

Modified: xfce4-settings/trunk/xfce4-settings-helper/accessx.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/accessx.c        2008-07-16 
19:48:55 UTC (rev 27317)
+++ xfce4-settings/trunk/xfce4-settings-helper/accessx.c        2008-07-16 
19:59:26 UTC (rev 27318)
@@ -245,6 +245,7 @@
         XkbSetControls (GDK_DISPLAY (), XkbControlsEnabledMask | 
XkbStickyKeysMask | XkbBounceKeysMask | XkbSlowKeysMask | XkbMouseKeysMask, 
xkb);
 
         /* free the structure */
+        XkbFreeControls (xkb, XkbAllControlsMask, True);
         XFree (xkb);
 
         /* flush errors and pop trap */

Modified: xfce4-settings/trunk/xfce4-settings-helper/xkb.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/xkb.c    2008-07-16 19:48:55 UTC 
(rev 27317)
+++ xfce4-settings/trunk/xfce4-settings-helper/xkb.c    2008-07-16 19:59:26 UTC 
(rev 27318)
@@ -211,6 +211,7 @@
         XkbSetControls (GDK_DISPLAY (), XkbRepeatKeysMask, xkb);
 
         /* cleanup */
+        XkbFreeControls (xkb, XkbRepeatKeysMask, True);
         XFree (xkb);
     }
 

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to