From: Matthias Clasen Date: Mon, 23 Aug 2004 05:36:48 +0000 (+0000) Subject: Don't call g_get_home_dir() while holding the g_utils_global lock, simply X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ea92e29add36cf6bab1cd6d9c1c5e8097ced2c78;p=dana%2Fcg-glib.git Don't call g_get_home_dir() while holding the g_utils_global lock, simply Mon Aug 23 01:35:18 2004 Matthias Clasen * glib/gutils.c (g_get_user_cache_dir): * glib/gutils.c (g_get_user_config_dir): * glib/gutils.c (g_get_user_data_dir): Don't call g_get_home_dir() while holding the g_utils_global lock, simply use g_home_dir. (#150695, Jody Goldberg) --- diff --git a/ChangeLog b/ChangeLog index 77d73c46..b2be5def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Aug 23 01:35:18 2004 Matthias Clasen + + * glib/gutils.c (g_get_user_cache_dir): + * glib/gutils.c (g_get_user_config_dir): + * glib/gutils.c (g_get_user_data_dir): Don't call g_get_home_dir() + while holding the g_utils_global lock, simply use g_home_dir. + (#150695, Jody Goldberg) + 2004-08-21 Tor Lillqvist * glib/giowin32.c (g_io_win32_finalize): Tell select_thread to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 77d73c46..b2be5def 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Aug 23 01:35:18 2004 Matthias Clasen + + * glib/gutils.c (g_get_user_cache_dir): + * glib/gutils.c (g_get_user_config_dir): + * glib/gutils.c (g_get_user_data_dir): Don't call g_get_home_dir() + while holding the g_utils_global lock, simply use g_home_dir. + (#150695, Jody Goldberg) + 2004-08-21 Tor Lillqvist * glib/giowin32.c (g_io_win32_finalize): Tell select_thread to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 77d73c46..b2be5def 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Mon Aug 23 01:35:18 2004 Matthias Clasen + + * glib/gutils.c (g_get_user_cache_dir): + * glib/gutils.c (g_get_user_config_dir): + * glib/gutils.c (g_get_user_data_dir): Don't call g_get_home_dir() + while holding the g_utils_global lock, simply use g_home_dir. + (#150695, Jody Goldberg) + 2004-08-21 Tor Lillqvist * glib/giowin32.c (g_io_win32_finalize): Tell select_thread to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 77d73c46..b2be5def 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Aug 23 01:35:18 2004 Matthias Clasen + + * glib/gutils.c (g_get_user_cache_dir): + * glib/gutils.c (g_get_user_config_dir): + * glib/gutils.c (g_get_user_data_dir): Don't call g_get_home_dir() + while holding the g_utils_global lock, simply use g_home_dir. + (#150695, Jody Goldberg) + 2004-08-21 Tor Lillqvist * glib/giowin32.c (g_io_win32_finalize): Tell select_thread to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 77d73c46..b2be5def 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Aug 23 01:35:18 2004 Matthias Clasen + + * glib/gutils.c (g_get_user_cache_dir): + * glib/gutils.c (g_get_user_config_dir): + * glib/gutils.c (g_get_user_data_dir): Don't call g_get_home_dir() + while holding the g_utils_global lock, simply use g_home_dir. + (#150695, Jody Goldberg) + 2004-08-21 Tor Lillqvist * glib/giowin32.c (g_io_win32_finalize): Tell select_thread to diff --git a/glib/gutils.c b/glib/gutils.c index 9512b74c..e46c0481 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1274,8 +1274,13 @@ g_get_user_data_dir (void) if (data_dir && data_dir[0]) data_dir = g_strdup (data_dir); else - data_dir = g_build_filename (g_get_home_dir (), ".local", - "share", NULL); + { + if (!g_tmp_dir) + g_get_any_init (); + + data_dir = g_build_filename (g_home_dir, ".local", + "share", NULL); + } g_user_data_dir = data_dir; } @@ -1315,7 +1320,12 @@ g_get_user_config_dir (void) if (config_dir && config_dir[0]) config_dir = g_strdup (config_dir); else - config_dir = g_build_filename (g_get_home_dir (), ".config", NULL); + { + if (!g_tmp_dir) + g_get_any_init (); + + config_dir = g_build_filename (g_home_dir, ".config", NULL); + } g_user_config_dir = config_dir; } @@ -1355,7 +1365,12 @@ g_get_user_cache_dir (void) if (cache_dir && cache_dir[0]) cache_dir = g_strdup (cache_dir); else - cache_dir = g_build_filename (g_get_home_dir (), ".cache", NULL); + { + if (!g_tmp_dir) + g_get_any_init (); + + cache_dir = g_build_filename (g_home_dir, ".cache", NULL); + } g_user_cache_dir = cache_dir; } else