From a49d811065701c5f3abb25b9e4945ce7547d0b53 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 29 Jul 2008 13:15:50 +0930
Subject: [PATCH] Revert "xkb: delete default rules when devices are closed."

This reverts commit 7cdef0d6fc3ec6705a61014b741a4c24dc60973b.

Nor was this one.
---
 dix/devices.c    |  3 ---
 include/xkbsrv.h |  4 ----
 xkb/xkbInit.c    | 15 ---------------
 3 files changed, 22 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index c02b7ae55..f6f3c8ece 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -634,9 +634,6 @@ CloseDownDevices(void)
     inputInfo.off_devices = NULL;
     inputInfo.keyboard = NULL;
     inputInfo.pointer = NULL;
-#ifdef XKB
-    XkbDeleteRulesDflts();
-#endif
 }
 
 /**
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index b52eb6520..acf3bb0a3 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -895,10 +895,6 @@ extern	void	XkbSetRulesDflts(
 	char *			/* options */
 );
 
-extern	void	XkbDeleteRulesDflts(
-	void
-);
-
 extern	void	XkbInitDevice(
 	DeviceIntPtr 	/* pXDev */
 );
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 87ee0720e..c0867adf0 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -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)