Make RgbPath keyword in xorg.conf a non-fatal error
Xorg shouldn't refuse to run just because the user has an xorg.conf that had the previously-used RgbPath keyword in it. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
344b1f2b25
commit
d2cf562bba
|
@ -73,6 +73,8 @@ static xf86ConfigSymTabRec FilesTab[] =
|
|||
{INPUTDEVICES, "inputdevices"},
|
||||
{LOGFILEPATH, "logfile"},
|
||||
{XKBDIR, "xkbdir"},
|
||||
/* Obsolete keywords that aren't used but shouldn't cause errors: */
|
||||
{OBSOLETE_TOKEN, "rgbpath"},
|
||||
{-1, ""},
|
||||
};
|
||||
|
||||
|
@ -189,6 +191,10 @@ xf86parseFilesSection (void)
|
|||
case EOF_TOKEN:
|
||||
Error (UNEXPECTED_EOF_MSG, NULL);
|
||||
break;
|
||||
case OBSOLETE_TOKEN:
|
||||
xf86parseError (OBSOLETE_MSG, xf86tokenString ());
|
||||
xf86getSubToken (&(ptr->file_comment));
|
||||
break;
|
||||
default:
|
||||
Error (INVALID_KEYWORD_MSG, xf86tokenString ());
|
||||
break;
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
|
||||
typedef enum {
|
||||
/* errno-style tokens */
|
||||
OBSOLETE_TOKEN = -5,
|
||||
EOF_TOKEN = -4,
|
||||
LOCK_TOKEN = -3,
|
||||
ERROR_TOKEN = -2,
|
||||
|
|
Loading…
Reference in New Issue
Block a user