*** language.c.ORIG	Thu Jul 20 19:17:14 2006
--- language.c	Wed Sep 20 18:43:23 2006
***************
*** 406,419 ****
  
          *ptr = '\0';
        }
-       else
-       {
-        /*
-         * Default to UTF-8...
- 	*/
- 
-         strcpy(charset, "UTF8");
-       }
  
       /*
        * Get the locale for messages from the LC_MESSAGES locale setting...
--- 406,411 ----
***************
*** 472,477 ****
--- 464,479 ----
                    charset));
    }
  #endif /* CODESET */
+ 
+   if (!charset[0])
+   {
+    /*
+     * Default to UTF-8...
+     */
+ 
+     strcpy(charset, "UTF8");
+     DEBUG_printf(("cupsLangGet: switching to default: %s\n", charset));
+   }
  
   /*
    * Parse the language string passed in to a locale string. "C" is the