[gnome-shell] Set GCONF_DEFAULT_SOURCE_PATH from the gnome-shell wrapper script



commit a5e3227b64a69ec2925ca0fbadabff0f4e4dd038
Author: Dan Winship <danw gnome org>
Date:   Tue Jun 30 17:29:40 2009 -0400

    Set GCONF_DEFAULT_SOURCE_PATH from the gnome-shell wrapper script
    
    Needed so that a jhbuilt gnome-shell can find its schemas at runtime

 src/Makefile.am    |    1 +
 src/gnome-shell.in |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e0aab00..e752ffa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,7 @@ gnome-shell: gnome-shell.in
 	    -e "s|@libexecdir[ ]|$(libexecdir)|" \
 	    -e "s|@libdir[ ]|$(libdir)|" \
 	    -e "s|@pkgdatadir[ ]|$(pkgdatadir)|" \
+	    -e "s|@sysconfdir[ ]|$(sysconfdir)|" \
 	    $< > $@ && chmod a+x $@
 CLEANFILES += gnome-shell
 EXTRA_DIST += gnome-shell.in
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 96c14ec..f1d5e0b 100755
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -141,6 +141,10 @@ def start_shell():
         env.update({'GNOME_SHELL_DATADIR' : data_dir,
                     'GI_TYPELIB_PATH'     : typelib_dir})
 
+    jhbuild_gconf_source = os.path.join('@sysconfdir@', 'gconf/2/path.jhbuild')
+    if os.path.exists(jhbuild_gconf_source):
+        env['GCONF_DEFAULT_SOURCE_PATH'] = jhbuild_gconf_source
+
     # Work around Ubuntu xulrunner bug,
     # http://bugzilla.gnome.org/show_bug.cgi?id=573413
     pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]