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

fileUtils: Fix fallback code for old gjs

Browse Source 
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
This commit is contained in:
Florian Müllner 2018-09-17 12:56:37 +02:00
parent 94423151b2
commit 2ed6290a40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/misc/fileUtils.js
View File

@ -90,7 +90,7 @@ function loadInterfaceXML(iface) {
if (bytes instanceof Uint8Array) if (bytes instanceof Uint8Array)
xml = imports.byteArray.toString(bytes) xml = imports.byteArray.toString(bytes)
else else
xml = bytes; xml = bytes.toString();
} catch (e) { } catch (e) {
log('Failed to load D-Bus interface ' + iface); log('Failed to load D-Bus interface ' + iface);
} }