isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fileUtils: Make loadInterfaceXML usable from tests

Browse Source 
The current code assumes that the resource has been installed,
which isn't the case when running distcheck.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/255
This commit is contained in:
Florian Müllner 2018-10-08 21:24:00 +02:00
parent d44ffc1158
commit 00613b304f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/misc/fileUtils.js
View File

@ -75,8 +75,9 @@ function recursivelyMoveDir(srcDir, destDir) {
let _ifaceResource = null; let _ifaceResource = null;
function loadInterfaceXML(iface) { function loadInterfaceXML(iface) {
if (!_ifaceResource) { if (!_ifaceResource) {
// don't use global.datadir so the method is usable from tools // don't use global.datadir so the method is usable from tests/tools
let path = Config.PKGDATADIR + '/gnome-shell-dbus-interfaces.gresource'; let dir = GLib.getenv ('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
let path = dir + '/gnome-shell-dbus-interfaces.gresource';
_ifaceResource = Gio.Resource.load(path); _ifaceResource = Gio.Resource.load(path);
_ifaceResource._register(); _ifaceResource._register();
} }