gconf r2588 - in trunk: . gconf
- From: kmaraas svn gnome org
- To: svn-commits-list gnome org
- Subject: gconf r2588 - in trunk: . gconf
- Date: Wed, 7 May 2008 11:38:34 +0100 (BST)
Author: kmaraas
Date: Wed May 7 10:38:34 2008
New Revision: 2588
URL: http://svn.gnome.org/viewvc/gconf?rev=2588&view=rev
Log:
2008-05-07 Kjartan Maraas <kmaraas gnome org>
* gconf/gconf-internals.c: (gconf_get_daemon_dir):
* gconf/gconf-sanity-check.c: (check_file_locking):
Patch from Frederic Crozat to allow override $TMPDIR.
Closes bug #497113.
Modified:
trunk/ChangeLog
trunk/gconf/gconf-internals.c
trunk/gconf/gconf-sanity-check.c
Modified: trunk/gconf/gconf-internals.c
==============================================================================
--- trunk/gconf/gconf-internals.c (original)
+++ trunk/gconf/gconf-internals.c Wed May 7 10:38:34 2008
@@ -2818,10 +2818,17 @@
{
char *s;
char *subdir;
+ char *tmpdir;
subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL);
- s = g_build_filename (g_get_tmp_dir (), subdir, NULL);
+ if (g_getenv ("GCONF_TMPDIR")) {
+ tmpdir = g_getenv ("GCONF_TMPDIR");
+ } else {
+ tmpdir = g_get_tmp_dir ();
+ }
+
+ s = g_build_filename (tmpdir, subdir, NULL);
g_free (subdir);
Modified: trunk/gconf/gconf-sanity-check.c
==============================================================================
--- trunk/gconf/gconf-sanity-check.c (original)
+++ trunk/gconf/gconf-sanity-check.c Wed May 7 10:38:34 2008
@@ -119,9 +119,23 @@
GError *err;
err = NULL;
- fd = g_file_open_tmp ("gconf-test-locking-file-XXXXXX",
- &testfile,
- &err);
+ if (g_getenv ("GCONF_TMPDIR")) {
+ testfile = g_build_filename(g_getenv ("GCONF_TMPDIR"), "gconf-test-locking-file-XXXXXX", NULL);
+ fd = g_mkstemp (testfile);
+ if (fd == -1)
+ {
+ g_set_error (&err,
+ G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ "Failed to create file '%s': %s",
+ testfile, g_strerror (errno));
+ }
+ }
+ else {
+ fd = g_file_open_tmp ("gconf-test-locking-file-XXXXXX",
+ &testfile,
+ &err);
+ }
if (err != NULL)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]