From b0acc97a9348ad1151416728ae391346df9d5b4e Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat, 28 Mar 2009 12:03:35 -0700
Subject: [PATCH] xkbcomp: s/XStringToKeysym/XkbcStringToKeysym/

---
 src/xkbcomp/expr.c       | 2 +-
 src/xkbcomp/parseutils.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index c71399a..38e15db 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -1052,7 +1052,7 @@ ExprResolveKeySym(ExprDef * expr,
     {
         char *str;
         str = XkbcAtomGetString(expr->value.str);
-        if ((str != NULL) && ((sym = XStringToKeysym(str)) != NoSymbol))
+        if ((str != NULL) && ((sym = XkbcStringToKeysym(str)) != NoSymbol))
         {
             val_rtrn->uval = sym;
             return True;
diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index 5ab435e..2e10798 100644
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -636,7 +636,7 @@ LookupKeysym(char *str, KeySym * sym_rtrn)
         *sym_rtrn = XK_VoidSymbol;
         return 1;
     }
-    sym = XStringToKeysym(str);
+    sym = XkbcStringToKeysym(str);
     if (sym != NoSymbol)
     {
         *sym_rtrn = sym;