2ed6290a40
gjs's D-Bus convenience explicitly expects a string representation
of an interface, but the new convenience method to load an XML
description from a resource introduced in commit f42d9df3e0 only
returns a string when using gjs from the GNOME 3.30 release. We
have so far managed to keep compatibility with the previous stable
gjs release, so fix up the fallback code to cast to string.
https://gitlab.gnome.org/GNOME/gnome-shell/issues/578
100 lines
3.2 KiB
JavaScript
100 lines
3.2 KiB
JavaScript
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
|
|
|
const Gio = imports.gi.Gio;
|
|
const GLib = imports.gi.GLib;
|
|
const Lang = imports.lang;
|
|
const Config = imports.misc.config;
|
|
const Params = imports.misc.params;
|
|
|
|
function collectFromDatadirs(subdir, includeUserDir, processFile) {
|
|
let dataDirs = GLib.get_system_data_dirs();
|
|
if (includeUserDir)
|
|
dataDirs.unshift(GLib.get_user_data_dir());
|
|
|
|
for (let i = 0; i < dataDirs.length; i++) {
|
|
let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', subdir]);
|
|
let dir = Gio.File.new_for_path(path);
|
|
|
|
let fileEnum;
|
|
try {
|
|
fileEnum = dir.enumerate_children('standard::name,standard::type',
|
|
Gio.FileQueryInfoFlags.NONE, null);
|
|
} catch (e) {
|
|
fileEnum = null;
|
|
}
|
|
if (fileEnum != null) {
|
|
let info;
|
|
while ((info = fileEnum.next_file(null)))
|
|
processFile(fileEnum.get_child(info), info);
|
|
}
|
|
}
|
|
}
|
|
|
|
function deleteGFile(file) {
|
|
// Work around 'delete' being a keyword in JS.
|
|
return file['delete'](null);
|
|
}
|
|
|
|
function recursivelyDeleteDir(dir, deleteParent) {
|
|
let children = dir.enumerate_children('standard::name,standard::type',
|
|
Gio.FileQueryInfoFlags.NONE, null);
|
|
|
|
let info, child;
|
|
while ((info = children.next_file(null)) != null) {
|
|
let type = info.get_file_type();
|
|
let child = dir.get_child(info.get_name());
|
|
if (type == Gio.FileType.REGULAR)
|
|
deleteGFile(child);
|
|
else if (type == Gio.FileType.DIRECTORY)
|
|
recursivelyDeleteDir(child, true);
|
|
}
|
|
|
|
if (deleteParent)
|
|
deleteGFile(dir);
|
|
}
|
|
|
|
function recursivelyMoveDir(srcDir, destDir) {
|
|
let children = srcDir.enumerate_children('standard::name,standard::type',
|
|
Gio.FileQueryInfoFlags.NONE, null);
|
|
|
|
if (!destDir.query_exists(null))
|
|
destDir.make_directory_with_parents(null);
|
|
|
|
let info, child;
|
|
while ((info = children.next_file(null)) != null) {
|
|
let type = info.get_file_type();
|
|
let srcChild = srcDir.get_child(info.get_name());
|
|
let destChild = destDir.get_child(info.get_name());
|
|
if (type == Gio.FileType.REGULAR)
|
|
srcChild.move(destChild, Gio.FileCopyFlags.NONE, null, null);
|
|
else if (type == Gio.FileType.DIRECTORY)
|
|
recursivelyMoveDir(srcChild, destChild);
|
|
}
|
|
}
|
|
|
|
let _ifaceResource = null;
|
|
function loadInterfaceXML(iface) {
|
|
if (!_ifaceResource) {
|
|
// don't use global.datadir so the method is usable from tools
|
|
let path = Config.PKGDATADIR + '/gnome-shell-dbus-interfaces.gresource';
|
|
_ifaceResource = Gio.Resource.load(path);
|
|
_ifaceResource._register();
|
|
}
|
|
|
|
let xml = null;
|
|
let uri = 'resource:///org/gnome/shell/dbus-interfaces/' + iface + '.xml';
|
|
let f = Gio.File.new_for_uri(uri);
|
|
|
|
try {
|
|
let [ok, bytes] = f.load_contents(null);
|
|
if (bytes instanceof Uint8Array)
|
|
xml = imports.byteArray.toString(bytes)
|
|
else
|
|
xml = bytes.toString();
|
|
} catch (e) {
|
|
log('Failed to load D-Bus interface ' + iface);
|
|
}
|
|
|
|
return xml;
|
|
}
|