[Xfce4-commits] r24047 - xfwm4/branches/xfce_4_2/src

[Olivier Fourdan]

Author: olivier
Date: 2006-12-04 20:32:53 +0000 (Mon, 04 Dec 2006)
New Revision: 24047

Modified:
   xfwm4/branches/xfce_4_2/src/events.c
Log:
Backport a fix for a huge X resources leak in handleMappingNotify () (bug #2618)

Modified: xfwm4/branches/xfce_4_2/src/events.c
===================================================================
--- xfwm4/branches/xfce_4_2/src/events.c	2006-12-04 20:31:24 UTC (rev 24046)
+++ xfwm4/branches/xfce_4_2/src/events.c	2006-12-04 20:32:53 UTC (rev 24047)
@@ -1993,8 +1993,6 @@
 static void
 handleMappingNotify (DisplayInfo *display_info, XMappingEvent * ev)
 {
-    GSList *screens;
-
     TRACE ("entering handleMappingNotify");
 
     /* Refreshes the stored modifier and keymap information */
@@ -2010,20 +2008,8 @@
     /* Regrab all keys if the notify is for keyboard (ie not pointer) */
     if (ev->request != MappingPointer)
     {
-        TRACE ("handleMappingNotify: Regrab keys");
-        for (screens = display_info->screens; screens; screens = g_slist_next (screens))
-        {
-            ScreenInfo *screen_info = (ScreenInfo *) screens->data;
-
-            /* We need to reload all the settings to recompute the key bindings... */
-            loadSettings (screen_info);
-
-            /* ...then update all frames grabs... */
-            clientUpdateAllFrames (screen_info, UPDATE_BUTTON_GRABS | UPDATE_KEY_GRABS);
-
-            /* ...and regrab the keys we have on the root win... */
-            myScreenGrabKeys (screen_info);
-        }
+        TRACE ("handleMappingNotify: Reload settings");
+        reloadSettings (display_info, UPDATE_BUTTON_GRABS);
     }
 }