196fae2f6d
Overview of Changes from GLib 2.12.0 to GLib 2.12.1 =================================================== * Update to final Unicode Character Database 5.0.0 * Bugs fixed: 346660 issues with base64 api documentation / g_base64_decode_cl... 348136 Coverity reports allocation of wrong size CID #2839 336281 Update to UCD 5.0 346197 g_date_strftime %F option doesnt work for win32 348011 Small optimization to real_toupper() 246494 prototype mismatch in glib/gconvert.c * New and updated translations (bg,bn_IN,ca,dz,eu,fi, fr,he,it,ja,mk,or,pt)
31 lines
1.1 KiB
Text
31 lines
1.1 KiB
Text
$NetBSD: patch-ah,v 1.7 2006/07/23 14:15:02 wiz Exp $
|
|
|
|
--- glib/gutils.c.orig 2006-07-06 20:30:16.000000000 +0000
|
|
+++ glib/gutils.c
|
|
@@ -2489,7 +2489,7 @@ g_get_system_data_dirs (void)
|
|
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
|
|
|
|
if (!data_dirs || !data_dirs[0])
|
|
- data_dirs = "/usr/local/share/:/usr/share/";
|
|
+ data_dirs = PREFIX "/share/";
|
|
|
|
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
|
|
#endif
|
|
@@ -2543,7 +2543,7 @@ g_get_system_config_dirs (void)
|
|
conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
|
|
|
|
if (!conf_dirs || !conf_dirs[0])
|
|
- conf_dirs = "/etc/xdg";
|
|
+ conf_dirs = PKG_SYSCONFDIR "/xdg";
|
|
|
|
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
|
|
#endif
|
|
@@ -2624,7 +2624,7 @@ unalias_lang (char *lang)
|
|
int i;
|
|
|
|
if (!alias_table)
|
|
- read_aliases ("/usr/share/locale/locale.alias");
|
|
+ read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias");
|
|
|
|
i = 0;
|
|
while ((p = g_hash_table_lookup (alias_table, lang)) && (strcmp (p, lang) != 0))
|