[shotwell] Fix search path for local gsettings schema
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Fix search path for local gsettings schema
- Date: Sat, 3 Jun 2017 12:06:22 +0000 (UTC)
commit d3f4bd0ab9dcf3bb8c7f4d2aeac1bfba2825db98
Author: Jens Georg <mail jensge org>
Date: Sat Jun 3 10:18:01 2017 +0200
Fix search path for local gsettings schema
misc/meson.build | 2 ++
src/main.vala | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/misc/meson.build b/misc/meson.build
index 6a67ce8..f4b766d 100644
--- a/misc/meson.build
+++ b/misc/meson.build
@@ -24,3 +24,5 @@ i18n.merge_file(input : 'shotwell-viewer.desktop.in',
install_data(['org.yorba.shotwell-extras.gschema.xml',
'org.yorba.shotwell.gschema.xml'],
install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'schemas'))
+
+gnome.compile_schemas()
diff --git a/src/main.vala b/src/main.vala
index 6449d95..d09c827 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -347,7 +347,7 @@ void main(string[] args) {
// the build directory. this allows us to access local GSettings schemas without having to
// muck with the user's XDG_... directories, which is seriously frowned upon
if (AppDirs.get_install_dir() == null) {
- GLib.Environment.set_variable("GSETTINGS_SCHEMA_DIR", AppDirs.get_exec_dir().get_path() +
+ GLib.Environment.set_variable("GSETTINGS_SCHEMA_DIR", AppDirs.get_lib_dir().get_path() +
"/misc", true);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]