[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/access
From:       Gunnar Schmidt <gunnar () schmi-dt ! de>
Date:       2005-01-26 1:50:40
Message-ID: 20050126015040.195021C00A () office ! kde ! org
[Download RAW message or body]

CVS commit by gunnar: 

Fixed Bug #97837


  M +3 -0      kaccess.cpp   1.24
  M +2 -0      kcmaccess.cpp   1.41


--- kdebase/kcontrol/access/kaccess.cpp  #1.23:1.24
@@ -274,4 +274,7 @@ QString mouseKeysShortcut (Display *disp
   XkbDescPtr xkbdesc = XkbGetMap(display, XkbKeyTypesMask | XkbKeySymsMask, XkbUseCoreKbd);
 
+  if (!xkbdesc)
+      return ""; // Failed to obtain the mapping from server
+
   bool found = false;
   unsigned char modifiers = 0;

--- kdebase/kcontrol/access/kcmaccess.cpp  #1.40:1.41
@@ -80,4 +80,6 @@ QString mouseKeysShortcut (Display *disp
   // Calculate the modifiers by searching the keysym in the X keyboard mapping
   XkbDescPtr xkbdesc = XkbGetMap(display, XkbKeyTypesMask | XkbKeySymsMask, XkbUseCoreKbd);
+  if (!xkbdesc)
+     return ""; // Failed to obtain the mapping from server
 
   bool found = false;


[prev in list] [next in list] [prev in thread] [next in thread]