summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/xkbatom.c2
-rw-r--r--src/xkbout.c6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 783a2db..45901ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-12 Daniel Stone <daniel@freedesktop.org>
+
+ * src/xkbatom.c:
+ * src/xkbout.c:
+ Fix offline operation.
+
2006-04-10 Daniel Stone <daniel@freedesktop.org>
* src/xkbtext.c:
diff --git a/src/xkbatom.c b/src/xkbatom.c
index 1a5dea0..24bdcd7 100644
--- a/src/xkbatom.c
+++ b/src/xkbatom.c
@@ -180,7 +180,7 @@ _XkbNameForAtom(Atom atom)
NodePtr node;
if (atom > lastAtom) return 0;
if ((node = nodeTable[atom]) == (NodePtr)NULL) return 0;
- return node->string;
+ return strdup(node->string);
}
static void
diff --git a/src/xkbout.c b/src/xkbout.c
index 1a2b869..53457f1 100644
--- a/src/xkbout.c
+++ b/src/xkbout.c
@@ -135,7 +135,7 @@ Display * dpy;
char * alternate;
xkb= result->xkb;
- if ((!xkb)||(!xkb->names)||(!xkb->names->keys)||(!xkb->dpy)) {
+ if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
_XkbLibError(_XkbErrMissingNames,"XkbWriteXKBKeycodes",0);
return False;
}
@@ -199,7 +199,7 @@ XkbKTMapEntryPtr entry;
XkbDescPtr xkb;
xkb= result->xkb;
- if ((!xkb)||(!xkb->map)||(!xkb->map->types)||(!xkb->dpy)) {
+ if ((!xkb)||(!xkb->map)||(!xkb->map->types)) {
_XkbLibError(_XkbErrMissingTypes,"XkbWriteXKBKeyTypes",0);
return False;
}
@@ -314,7 +314,7 @@ XkbSymInterpretPtr interp;
XkbDescPtr xkb;
xkb= result->xkb;
- if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)||(!xkb->dpy)) {
+ if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)) {
_XkbLibError(_XkbErrMissingCompatMap,"XkbWriteXKBCompatMap",0);
return False;
}