Mirror 1.1.x changes.

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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 44b9b0e5cad7e9ff9727f330216376bdb9d93221..157b446c356f57eb8cc006224c2fd1f75db09e4b 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19rc5
 
+       - cupsLangGet() could fail on OSX due to a corrupt
+         language preference (STR #78)
        - Added more checks for HTTP request timeouts.
        - The scheduler dropped the first non-alpha character
          after an open brace when doing attribute substitutions

diff --git a/cups/language.c b/cups/language.c
index e7c4646ae366a28b3082f0054f0025a3e4d32dc8..1874e925a9f8c784686a22e32649da6bdcf3bc1a 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c,v 1.20.2.17 2003/04/23 14:42:09 mike Exp $"
+ * "$Id: language.c,v 1.20.2.18 2003/05/09 18:44:41 mike Exp $"
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -682,7 +682,8 @@ appleLangDefault(void)
                                                  kCFPreferencesCurrentApplication);
 
     if (localizationList != NULL &&
-        CFGetTypeID(localizationList) == CFArrayGetTypeID())
+        CFGetTypeID(localizationList) == CFArrayGetTypeID() &&
+       CFArrayGetCount(localizationList) > 0)
     {
       localizationName = CFArrayGetValueAtIndex(localizationList, 0);
 
@@ -730,5 +731,5 @@ appleLangDefault(void)
 
 
 /*
- * End of "$Id: language.c,v 1.20.2.17 2003/04/23 14:42:09 mike Exp $".
+ * End of "$Id: language.c,v 1.20.2.18 2003/05/09 18:44:41 mike Exp $".
  */