Skip to content

N
nx-libs
Commit 59524cd0 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Keyboard.c: simplify even more: free stuff at one place

parent b8ae794e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 16 deletions
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @ 59524cd0
...@@ -723,14 +723,6 @@ XkbError: ...@@ -723,14 +723,6 @@ XkbError:
fprintf(stderr, "nxagentKeyboardProc: XKB error.\n"); fprintf(stderr, "nxagentKeyboardProc: XKB error.\n");
#endif #endif
if (xkb)
{
XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
xkb = NULL;
}
free(model);
free(layout);
#endif #endif
XGetKeyboardControl(nxagentDisplay, &values); XGetKeyboardControl(nxagentDisplay, &values);
...@@ -863,16 +855,16 @@ XkbError: ...@@ -863,16 +855,16 @@ XkbError:
{ {
NXShadowInitKeymap(&(pDev->key->curKeySyms)); NXShadowInitKeymap(&(pDev->key->curKeySyms));
} }
}
if (xkb) if (xkb)
{ {
XkbFreeKeyboard(xkb, XkbAllComponentsMask, True); XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
xkb = NULL; xkb = NULL;
}
free(model);
free(layout);
} }
free(model);
free(layout);
#endif #endif
#ifdef WATCH #ifdef WATCH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment