xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Config.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree f6a983533bdc84752562ef0be25b320678bf08a1 (from 21e8f4eb02842f877336db08c332d8ee4a381ee0)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Sat Jun 2 16:37:39 2007 -0400

    Don't warn about default behaviour when autoconfigging.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 67e8af4..877ea62 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -615,7 +615,7 @@ configFiles(XF86ConfFilesPtr fileconf)
       pathFrom = X_CONFIG;
       if (*f) {
         if (xf86Info.useDefaultFontPath) {
-          xf86Msg(X_WARNING, "Including the default font path %s.\n", defaultFontPath);
+          xf86Msg(X_DEFAULT, "Including the default font path %s.\n", defaultFontPath);
           char *g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
           strcpy(g, f);
           strcat(g, ",");
@@ -632,7 +632,7 @@ configFiles(XF86ConfFilesPtr fileconf)
       }
     } 
    } else {
-      xf86Msg(X_WARNING,
+      xf86Msg(X_DEFAULT,
 	    "No FontPath specified.  Using compiled-in default.\n");
       pathFrom = X_DEFAULT;
    }
@@ -1474,13 +1474,13 @@ checkCoreInputDevices(serverLayoutPtr se
     }
 
     if (pointerMsg) {
-	xf86Msg(X_WARNING, "The core pointer device wasn't specified "
+	xf86Msg(X_DEFAULT, "The core pointer device wasn't specified "
 		"explicitly in the layout.\n"
 		"\tUsing the %s.\n", pointerMsg);
     }
 
     if (keyboardMsg) {
-	xf86Msg(X_WARNING, "The core keyboard device wasn't specified "
+	xf86Msg(X_DEFAULT, "The core keyboard device wasn't specified "
 		"explicitly in the layout.\n"
 		"\tUsing the %s.\n", keyboardMsg);
     }
@@ -1937,7 +1937,7 @@ configScreen(confScreenPtr screenp, XF86
     }
 
     if (defaultMonitor) {
-	xf86Msg(X_WARNING, "No monitor specified for screen \"%s\".\n"
+	xf86Msg(X_DEFAULT, "No monitor specified for screen \"%s\".\n"
 		"\tUsing a default monitor configuration.\n", screenp->id);
     }
     return TRUE;
@@ -2457,7 +2457,7 @@ xf86HandleConfigFile(Bool autoconfig)
 
     if (xf86configptr->conf_layout_lst == NULL || xf86ScreenName != NULL) {
 	if (xf86ScreenName == NULL) {
-	    xf86Msg(X_WARNING,
+	    xf86Msg(X_DEFAULT,
 		    "No Layout section.  Using the first Screen section.\n");
 	}
 	if (!configImpliedLayout(&xf86ConfigLayout,