From 6e7da3c7c40deed551d14b6bab6f3d1ac256509f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 3 Apr 2020 17:53:33 -0700
Subject: Remove call to FcNameRegisterObjectTypes

This fontconfig function has been deprecated and no longer does
anything.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/xftinit.c |  1 -
 src/xftint.h  |  2 --
 src/xftname.c | 22 ----------------------
 3 files changed, 25 deletions(-)

diff --git a/src/xftinit.c b/src/xftinit.c
index ff23722..78eb3ed 100644
--- a/src/xftinit.c
+++ b/src/xftinit.c
@@ -32,7 +32,6 @@ XftInit (_Xconst char *config)
     _XftConfigInitialized = True;
     if (!FcInit ())
 	return False;
-    _XftNameInit ();
     return True;
 }
 
diff --git a/src/xftint.h b/src/xftint.h
index c06ac3c..ced9a02 100644
--- a/src/xftint.h
+++ b/src/xftint.h
@@ -428,8 +428,6 @@ XftListFontsPatternObjects (Display	    *dpy,
 			    FcObjectSet    *os);
 
 /* xftname.c */
-void
-_XftNameInit (void);
 
 /* xftrender.c */
 
diff --git a/src/xftname.c b/src/xftname.c
index 30dd6e0..e120199 100644
--- a/src/xftname.c
+++ b/src/xftname.c
@@ -22,30 +22,9 @@
 
 #include "xftint.h"
 
-static const FcObjectType	_XftObjectTypes[] = {
-    { XFT_CORE,		FcTypeBool, },
-    { XFT_XLFD,		FcTypeString, },
-    { XFT_RENDER,	FcTypeBool, },
-    { XFT_MAX_GLYPH_MEMORY, FcTypeInteger, },
-};
-
-#define NUM_OBJECT_TYPES    (sizeof _XftObjectTypes / sizeof _XftObjectTypes[0])
-
-static FcBool _XftNameInitialized;
-
-_X_HIDDEN void
-_XftNameInit (void)
-{
-    if (_XftNameInitialized)
-	return;
-    _XftNameInitialized = FcTrue;
-    FcNameRegisterObjectTypes (_XftObjectTypes, NUM_OBJECT_TYPES);
-}
-
 _X_EXPORT FcPattern
 *XftNameParse (const char *name)
 {
-    _XftNameInit ();
     return FcNameParse ((FcChar8 *) name);
 }
 
@@ -54,7 +33,6 @@ XftNameUnparse (FcPattern *pat, char *dest, int len)
 {
     FcChar8 *name;
 
-    _XftNameInit ();
     name = FcNameUnparse (pat);
     if (!name)
 	return FcFalse;
-- 
cgit v1.2.1