Enlightenment CVS committal
Author : andyetitmoves
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_intl.c
Log Message:
(e_intl_language_set) Fixed a bug when lang is NULL. The expected behaviour is
to restore the original environment variables. The code, after doing this, sets
back all the env vars to _e_intl_language. This fails when the different locale
env vars have different values.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- e_intl.c 26 Nov 2005 11:44:02 -0000 1.56
+++ e_intl.c 1 Dec 2005 16:53:20 -0000 1.57
@@ -137,35 +137,31 @@
e_intl_language_set(const char *lang)
{
if (_e_intl_language) free(_e_intl_language);
- /* NULL lang means set everything back to the original environemtn defaults
*/
- if (!lang)
- {
- e_util_env_set("LC_MESSAGES", _e_intl_orig_lc_messages);
- e_util_env_set("LANGUAGE", _e_intl_orig_language);
- e_util_env_set("LC_ALL", _e_intl_orig_lc_all);
- e_util_env_set("LANG", _e_intl_orig_lang);
- }
- if (!lang) lang = getenv("LC_MESSAGES");
- if (!lang) lang = getenv("LANGUAGE");
- if (!lang) lang = getenv("LC_ALL");
- if (!lang) lang = getenv("LANG");
if (lang)
{
- _e_intl_language = strdup(lang);
e_util_env_set("LANGUAGE", _e_intl_language);
/* FIXME: maybe we should set these anyway? */
if (getenv("LANG")) e_util_env_set("LANG", _e_intl_language);
if (getenv("LC_ALL")) e_util_env_set("LC_ALL", _e_intl_language);
if (getenv("LC_MESSAGES")) e_util_env_set("LC_MESSAGES",
_e_intl_language);
}
+ /* NULL lang means set everything back to the original environment defaults
*/
else
{
- _e_intl_language = NULL;
+ e_util_env_set("LC_MESSAGES", _e_intl_orig_lc_messages);
+ e_util_env_set("LANGUAGE", _e_intl_orig_language);
+ e_util_env_set("LC_ALL", _e_intl_orig_lc_all);
+ e_util_env_set("LANG", _e_intl_orig_lang);
}
+ if (!lang) lang = getenv("LC_MESSAGES");
+ if (!lang) lang = getenv("LANGUAGE");
+ if (!lang) lang = getenv("LC_ALL");
+ if (!lang) lang = getenv("LANG");
+ _e_intl_language = (lang ? strdup (lang) : NULL);
if (setlocale(LC_ALL, _e_intl_language) == NULL)
{
- perror("setlocale() :");
+ perror("setlocale()");
if (_e_intl_language)
printf("An error occured when trying to use the locale:
%s\nDetails:\n",
_e_intl_language);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
