Enlightenment CVS committal
Author : sndev
Project : e_modules
Module : language
Dir : e_modules/language/src/module
Modified Files:
e_mod_lang.c
Log Message:
* make use of /etc/X11/xkb/rules/xfree86.xml first and then
/usr/lib/X11/xkb/rules/xfree86.xml
Some users reported that they do not have xfree86.xml in /usr/lib/X11/...
===================================================================
RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_mod_lang.c 1 Jun 2006 22:42:09 -0000 1.26
+++ e_mod_lang.c 12 Jun 2006 21:52:28 -0000 1.27
@@ -203,9 +203,13 @@
if (!exml) return;
if (!exml_init(exml)) EXML_RETURN_ON_ERROR(exml);
- result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml");
+ result = exml_file_read(exml, "/etc/X11/xkb/rules/xfree86.xml");
if (!result || result == -1)
- EXML_RETURN_ON_ERROR(exml);
+ {
+ result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml");
+ if (!result || result == -1)
+ EXML_RETURN_ON_ERROR(exml);
+ }
exml_down(exml);
@@ -287,9 +291,13 @@
if (!exml_init(exml))
EXML_RETURN_ON_ERROR(exml);
- result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml");
+ result = exml_file_read(exml, "/etc/X11/xkb/rules/xfree86.xml");
if (!result || result == -1)
- EXML_RETURN_ON_ERROR(exml);
+ {
+ result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml");
+ if (!result || result == -1)
+ EXML_RETURN_ON_ERROR(exml);
+ }
if (strcasecmp(exml_tag_get(exml), "xkbConfigRegistry"))
EXML_RETURN_ON_ERROR(exml);
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
