[gdm/gnome-3-0] dconf: set XDG_CACHE_HOME in addition to XDG_CONFIG_HOME

[Ray Strode <halfline src gnome org>]

commit d8d5455c617a22f79934f5351b8d8072e202e52a
Author: Ray Strode <rstrode redhat com>
Date:   Wed Jun 1 10:45:04 2011 -0400

    dconf: set XDG_CACHE_HOME in addition to XDG_CONFIG_HOME
    
    If we don't set this, it will use the default which can
    cause weird behavior when building in a logged in session.
    (cherry picked from commit 7f6cc6b06d401cf466ed56ea8a0f849c619ab176)

 data/make-dconf-override-db.sh |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
index 8f4dc6d..ca04852 100755
--- a/data/make-dconf-override-db.sh
+++ b/data/make-dconf-override-db.sh
@@ -2,10 +2,14 @@
 
 set -e
 
-export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD")
+export TMPDIR=$(mktemp -d --tmpdir="$PWD")
+export XDG_CONFIG_HOME="$TMPDIR/config"
+export XDG_CACHE_HOME="$TMPDIR/cache"
+mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME
+
 eval `dbus-launch --sh-syntax`
 
-trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR
+trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
 
 gsettings set org.gnome.power-manager show-actions false
 
@@ -51,6 +55,6 @@ gsettings set org.gnome.settings-daemon.plugins.xrandr active true
 gsettings set org.gnome.settings-daemon.plugins.xsettings active true
 
 mv $XDG_CONFIG_HOME/dconf/user dconf-override-db
-rm -rf $XDG_CONFIG_HOME
+rm -rf $TMPDIR
 
 kill $DBUS_SESSION_BUS_PID