andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "xkb: delete default rules when devices are closed."

Browse Source 
This reverts commit 7cdef0d6fc.

Nor was this one.
This commit is contained in:
Peter Hutterer 2008-07-29 13:15:50 +09:30
parent f0f3a11acd
commit a49d811065
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dix/devices.c
View File

@ -634,9 +634,6 @@ CloseDownDevices(void)
inputInfo.off_devices = NULL; inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL; inputInfo.keyboard = NULL;
inputInfo.pointer = NULL; inputInfo.pointer = NULL;
#ifdef XKB
XkbDeleteRulesDflts();
#endif
} }
/** /**

4
include/xkbsrv.h
View File

@ -895,10 +895,6 @@ extern void XkbSetRulesDflts(
char * /* options */ char * /* options */
); );
extern void XkbDeleteRulesDflts(
void
);
extern void XkbInitDevice( extern void XkbInitDevice(
DeviceIntPtr /* pXDev */ DeviceIntPtr /* pXDev */
); );

15
xkb/xkbInit.c
View File

@ -278,21 +278,6 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
return; 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) #if defined(luna)