Revert "xkb: delete default rules when devices are closed."
This reverts commit 7cdef0d6fc
.
Nor was this one.
This commit is contained in:
parent
f0f3a11acd
commit
a49d811065
|
@ -634,9 +634,6 @@ CloseDownDevices(void)
|
|||
inputInfo.off_devices = NULL;
|
||||
inputInfo.keyboard = NULL;
|
||||
inputInfo.pointer = NULL;
|
||||
#ifdef XKB
|
||||
XkbDeleteRulesDflts();
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -895,10 +895,6 @@ extern void XkbSetRulesDflts(
|
|||
char * /* options */
|
||||
);
|
||||
|
||||
extern void XkbDeleteRulesDflts(
|
||||
void
|
||||
);
|
||||
|
||||
extern void XkbInitDevice(
|
||||
DeviceIntPtr /* pXDev */
|
||||
);
|
||||
|
|
|
@ -278,21 +278,6 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
|
|||
return;
|
||||
}
|
||||
|
||||
void
|
||||
XkbDeleteRulesDflts()
|
||||
{
|
||||
_XkbFree(XkbRulesFile);
|
||||
XkbRulesFile = NULL;
|
||||
_XkbFree(XkbModelDflt);
|
||||
XkbModelDflt = NULL;
|
||||
_XkbFree(XkbLayoutDflt);
|
||||
XkbLayoutDflt = NULL;
|
||||
_XkbFree(XkbVariantDflt);
|
||||
XkbVariantDflt = NULL;
|
||||
_XkbFree(XkbOptionsDflt);
|
||||
XkbOptionsDflt = NULL;
|
||||
}
|
||||
|
||||
/***====================================================================***/
|
||||
|
||||
#if defined(luna)
|
||||
|
|
Loading…
Reference in New Issue
Block a user