diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2004-02-04 15:34:05 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2004-02-04 15:34:05 +0000 |
| commit | 9faf3f32a5765001e560b728053bd8b638ee6890 (patch) | |
| tree | 67330ea9eee22c29c4876d5775447128f2e4c7c5 /gnome-base/gconf/files | |
| parent | Added completion functions for rc, rc-update, rc-status, opengl-update and eb... (diff) | |
| download | historical-9faf3f32a5765001e560b728053bd8b638ee6890.tar.gz historical-9faf3f32a5765001e560b728053bd8b638ee6890.tar.bz2 historical-9faf3f32a5765001e560b728053bd8b638ee6890.zip | |
add new version with patch from mandrake rpms (#28787).
Diffstat (limited to 'gnome-base/gconf/files')
| -rw-r--r-- | gnome-base/gconf/files/digest-gconf-1.0.9 | 1 | ||||
| -rw-r--r-- | gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch | 57 |
2 files changed, 58 insertions, 0 deletions
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.9 b/gnome-base/gconf/files/digest-gconf-1.0.9 new file mode 100644 index 000000000000..0c0a5f1316f3 --- /dev/null +++ b/gnome-base/gconf/files/digest-gconf-1.0.9 @@ -0,0 +1 @@ +MD5 613aea1d9b7a9c504f52217451c7bf99 GConf-1.0.9.tar.bz2 784363 diff --git a/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch b/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch new file mode 100644 index 000000000000..71dae2a61acf --- /dev/null +++ b/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch @@ -0,0 +1,57 @@ +--- GConf-1.0.9/gconf/gconf-internals.c.locallock 2003-10-15 14:47:31.000000000 +0200 ++++ GConf-1.0.9/gconf/gconf-internals.c 2003-10-28 15:40:15.000000000 +0100 +@@ -2957,10 +2957,53 @@ + } + } + ++enum { UNKNOWN, LOCAL, NORMAL }; ++ ++ ++static gboolean ++gconf_use_local_locks (void) ++{ ++ static int local_locks = UNKNOWN; ++ ++ if (local_locks == UNKNOWN) ++ { ++ const char *l = ++ g_getenv ("GCONF_GLOBAL_LOCKS"); ++ ++ if (l && atoi (l) == 1) ++ local_locks = NORMAL; ++ else ++ local_locks = LOCAL; ++ } ++ ++ return local_locks == LOCAL; ++} ++ + char* + gconf_get_daemon_dir (void) + { +- return g_strconcat (g_get_home_dir (), "/.gconfd", NULL); ++ if (gconf_use_local_locks ()) ++ { ++ char *s; ++ char *subdir; ++ char *tmpdir; ++ ++ subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL); ++ ++ if (g_getenv ("GCONF_TMPDIR")) { ++ tmpdir = g_getenv ("GCONF_TMPDIR"); ++ } else { ++ tmpdir = g_get_tmp_dir (); ++ } ++ ++ s = g_strconcat (tmpdir,"/", subdir, NULL); ++ ++ g_free (subdir); ++ ++ return s; ++ } ++ else ++ return g_strconcat (g_get_home_dir (), "/.gconfd", NULL); + } + + char* |