[PATCH 1/3] dix: use one single function to register fpe fonts

[Tiago Vignatti]

X server doesn't need to understand fpe internals, so use
register_fpe_functions from libXfont.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 dix/dixfonts.c    |    4 +---
 include/dixfont.h |    5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index e321177..85c9b2b 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1924,9 +1924,7 @@ InitFonts (void)
 {
     patternCache = MakeFontPatternCache();
 
-    BuiltinRegisterFpeFunctions();
-    FontFileRegisterFpeFunctions();
-    fs_register_fpe_functions();
+    register_fpe_functions();
 }
 
 int
diff --git a/include/dixfont.h b/include/dixfont.h
index cf86f54..617b94a 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -141,10 +141,7 @@ extern _X_EXPORT void InitGlyphCaching(void);
 
 extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);
 
-/*
- * libXfont/src/builtins/builtin.h
- */
-extern _X_EXPORT void BuiltinRegisterFpeFunctions(void);
+extern _X_EXPORT void register_fpe_functions(void);
 
 /*
  * libXfont stubs.
-- 
1.7.1.226.g770c5