From 6cab826c52c2bb2cf34e666aa199144899fa01ea Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 16 Jul 2008 14:19:04 -0400
Subject: [PATCH] Remove the numVideoScreens xprintism.

This was to account for cases where you had video and print screens in
the same server.  Lunacy.  Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
(cherry picked from commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5)
---
 dix/dixfonts.c       | 15 +++------------
 dix/main.c           |  3 ---
 include/scrnintstr.h |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 6038da11e..f2c04ca33 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1892,21 +1892,12 @@ InitFonts (void)
 {
     patternCache = MakeFontPatternCache();
 
-#ifndef BUILTIN_FONTS
-    if (screenInfo.numScreens > screenInfo.numVideoScreens) {
-	PrinterFontRegisterFpeFunctions();
-	FontFileCheckRegisterFpeFunctions();
-	check_fs_register_fpe_functions();
-    } else 
-#endif
-    {
 #ifdef BUILTIN_FONTS
-        BuiltinRegisterFpeFunctions();
+    BuiltinRegisterFpeFunctions();
 #else
-	FontFileRegisterFpeFunctions();
-	fs_register_fpe_functions();
+    FontFileRegisterFpeFunctions();
+    fs_register_fpe_functions();
 #endif
-    }
 }
 
 int
diff --git a/dix/main.c b/dix/main.c
index 2249cc584..857dc25f4 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -332,7 +332,6 @@ int main(int argc, char *argv[], char *envp[])
 	SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]);
 	screenInfo.arraySize = MAXSCREENS;
 	screenInfo.numScreens = 0;
-	screenInfo.numVideoScreens = -1;
 	WindowTable = (WindowPtr *)xalloc(MAXSCREENS * sizeof(WindowPtr));
 	if (!WindowTable)
 	    FatalError("couldn't create root window table");
@@ -366,8 +365,6 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (screenInfo.numScreens < 1)
 	    FatalError("no screens found");
-	if (screenInfo.numVideoScreens < 0)
-	    screenInfo.numVideoScreens = screenInfo.numScreens;
 	InitExtensions(argc, argv);
 	if (!InitClientPrivates(serverClient))
 	    FatalError("failed to allocate serverClient devprivates");
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 110f4dce9..b63ef91d6 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -592,7 +592,7 @@ typedef struct _ScreenInfo {
     int		arraySize;
     int		numScreens;
     ScreenPtr	screens[MAXSCREENS];
-    int		numVideoScreens;
+    int		unused;
 } ScreenInfo;
 
 extern ScreenInfo screenInfo;