mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-06-05 12:20:13 +02:00
Don't call g_get_home_dir() while holding the g_utils_global lock, simply
Mon Aug 23 01:35:18 2004 Matthias Clasen <maclas@gmx.de> * 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)
This commit is contained in:
parent
39d921007e
commit
ea92e29add
@ -1,3 +1,11 @@
|
|||||||
|
Mon Aug 23 01:35:18 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* 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 <tml@iki.fi>
|
2004-08-21 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Mon Aug 23 01:35:18 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* 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 <tml@iki.fi>
|
2004-08-21 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Mon Aug 23 01:35:18 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* 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 <tml@iki.fi>
|
2004-08-21 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Mon Aug 23 01:35:18 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* 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 <tml@iki.fi>
|
2004-08-21 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Mon Aug 23 01:35:18 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* 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 <tml@iki.fi>
|
2004-08-21 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
* glib/giowin32.c (g_io_win32_finalize): Tell select_thread to
|
||||||
|
@ -1274,8 +1274,13 @@ g_get_user_data_dir (void)
|
|||||||
if (data_dir && data_dir[0])
|
if (data_dir && data_dir[0])
|
||||||
data_dir = g_strdup (data_dir);
|
data_dir = g_strdup (data_dir);
|
||||||
else
|
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;
|
g_user_data_dir = data_dir;
|
||||||
}
|
}
|
||||||
@ -1315,7 +1320,12 @@ g_get_user_config_dir (void)
|
|||||||
if (config_dir && config_dir[0])
|
if (config_dir && config_dir[0])
|
||||||
config_dir = g_strdup (config_dir);
|
config_dir = g_strdup (config_dir);
|
||||||
else
|
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;
|
g_user_config_dir = config_dir;
|
||||||
}
|
}
|
||||||
@ -1355,7 +1365,12 @@ g_get_user_cache_dir (void)
|
|||||||
if (cache_dir && cache_dir[0])
|
if (cache_dir && cache_dir[0])
|
||||||
cache_dir = g_strdup (cache_dir);
|
cache_dir = g_strdup (cache_dir);
|
||||||
else
|
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;
|
g_user_cache_dir = cache_dir;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user