From 9e1fb89e0a70fe91baf6a5103aaa5e599ce1bbdb Mon Sep 17 00:00:00 2001
From: "shanjian%netscape.com"
 <shanjian%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 29 Nov 2001 02:05:52 +0000
Subject: [PATCH] #34242 replace X font lookups on
 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" with "-*" patch prepared by:  Roland Mainz
 r=shanjian sr=brendan

git-svn-id: svn://10.0.0.236/trunk@109170 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp   | 2 +-
 mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
index 230505d18ef..60a8c425dbe 100644
--- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
@@ -3611,7 +3611,7 @@ GetAllFontNames(void)
     if (!gGlobalList) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    GetFontNames("-*-*-*-*-*-*-*-*-*-*-*-*-*-*", gGlobalList);
+    GetFontNames("-*", gGlobalList);
   }
 
   return NS_OK;
diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
index 985e9af0b8f..c3821dea4a2 100644
--- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
@@ -3418,7 +3418,9 @@ GetAllFontNames(void)
     if (!gGlobalList) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    GetFontNames("-*-*-*-*-*-*-*-*-*-*-*-*-*-*", gGlobalList);
+    /* Using "-*" instead of the full-qualified "-*-*-*-*-*-*-*-*-*-*-*-*-*-*"
+     * because it's faster and "smarter" - see bug 34242 for details. */
+    GetFontNames("-*", gGlobalList);
   }
 
   return NS_OK;