[gtk+/gtk-2-22] Avoid segfault on xkbless systems



commit bcdd895229353ec27fcf5c800f64bec85e430163
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Sep 7 00:10:26 2010 -0400

    Avoid segfault on xkbless systems
    
    This was reported in bug 628932 to cause problems on VNC.
    (cherry picked from commit d5c2cb7bcbdd2c5f9c1523043f2cd252421325c6)

 gdk/x11/gdkkeys-x11.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index b48d02e..8934b0e 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1794,7 +1794,9 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
 
   keymap = GET_EFFECTIVE_KEYMAP (keymap);
   keymap_x11 = GDK_KEYMAP_X11 (keymap);
-  get_xkb (keymap_x11);
+
+  if (KEYMAP_USE_XKB (keymap))
+    get_xkb (keymap_x11);
 
   retval = TRUE;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]