[gtk+] Avoid segfault on xkbless systems
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Avoid segfault on xkbless systems
- Date: Tue, 7 Sep 2010 04:12:10 +0000 (UTC)
commit d5c2cb7bcbdd2c5f9c1523043f2cd252421325c6
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.
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 c7963f5..827f87d 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1822,7 +1822,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]