Not used on Windows. (unalias_lang): Don't do anything on Windows, there

2005-04-08  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (read_aliases): Not used on Windows.
	(unalias_lang): Don't do anything on Windows, there is no
	/usr/share/locale/locale.alias file..
This commit is contained in:
Tor Lillqvist 2005-04-08 06:48:17 +00:00 committed by Tor Lillqvist
parent 53b26858c8
commit 30942cba28
5 changed files with 30 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2005-04-08 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (read_aliases): Not used on Windows.
(unalias_lang): Don't do anything on Windows, there is no
/usr/share/locale/locale.alias file..
Thu Apr 7 22:51:15 2005 <yosh@gimp.org>
* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir

View File

@ -1,3 +1,9 @@
2005-04-08 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (read_aliases): Not used on Windows.
(unalias_lang): Don't do anything on Windows, there is no
/usr/share/locale/locale.alias file..
Thu Apr 7 22:51:15 2005 <yosh@gimp.org>
* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir

View File

@ -1,3 +1,9 @@
2005-04-08 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (read_aliases): Not used on Windows.
(unalias_lang): Don't do anything on Windows, there is no
/usr/share/locale/locale.alias file..
Thu Apr 7 22:51:15 2005 <yosh@gimp.org>
* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir

View File

@ -1,3 +1,9 @@
2005-04-08 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (read_aliases): Not used on Windows.
(unalias_lang): Don't do anything on Windows, there is no
/usr/share/locale/locale.alias file..
Thu Apr 7 22:51:15 2005 <yosh@gimp.org>
* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir

View File

@ -2202,6 +2202,8 @@ g_get_system_config_dirs (void)
return (G_CONST_RETURN gchar * G_CONST_RETURN *) conf_dir_vector;
}
#ifndef G_OS_WIN32
static GHashTable *alias_table = NULL;
/* read an alias file for the locales */
@ -2257,9 +2259,12 @@ read_aliases (gchar *file)
fclose (fp);
}
#endif
static char *
unalias_lang (char *lang)
{
#ifndef G_OS_WIN32
char *p;
int i;
@ -2280,6 +2285,7 @@ unalias_lang (char *lang)
return lang;
}
}
#endif
return lang;
}