From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Thu, 15 May 2003 20:00:52 +0000 (+0000)
Subject: Mirror 1.1.x change.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cc69291f62e655a32e5c0396a7591b8aab0b79c;p=thirdparty%2Fcups.git

Mirror 1.1.x change.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3734 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/cups/language.c b/cups/language.c
index 1ec01c7d55..2f8a3befde 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c,v 1.20.2.19 2003/05/15 15:55:36 mike Exp $"
+ * "$Id: language.c,v 1.20.2.20 2003/05/15 20:00:52 mike Exp $"
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -389,6 +389,16 @@ cupsLangGet(const char *language)	/* I - Language or locale */
     }
   }
 
+ /*
+  * Restore the locale...
+  */
+
+#if defined(__APPLE__) || !defined(LC_CTYPE)
+  setlocale(LC_ALL, oldlocale);
+#else
+  setlocale(LC_CTYPE, oldlocale);
+#endif /* __APPLE__ || !LC_CTYPE */
+
  /*
   * Figure out the desired encoding...
   */
@@ -445,16 +455,6 @@ cupsLangGet(const char *language)	/* I - Language or locale */
       strcpy(real, langname);
   }
 
- /*
-  * Restore the locale...
-  */
-
-#if defined(__APPLE__) || !defined(LC_CTYPE)
-  setlocale(LC_ALL, oldlocale);
-#else
-  setlocale(LC_CTYPE, oldlocale);
-#endif /* __APPLE__ || !LC_CTYPE */
-
  /*
   * Open the messages file; the first line contains the default
   * language encoding (us-ascii, iso-8859-1, etc.), and the rest are
@@ -798,5 +798,5 @@ cups_cache_lookup(const char      *name,/* I - Name of locale */
 
 
 /*
- * End of "$Id: language.c,v 1.20.2.19 2003/05/15 15:55:36 mike Exp $".
+ * End of "$Id: language.c,v 1.20.2.20 2003/05/15 20:00:52 mike Exp $".
  */