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

js: Stop using Gio._LocalFilePrototype

Browse Source 
gjs now supports overriding interface methods, so promisify()
works on Gio.File itself, not just the LocalFilePrototype cludge.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2174>
This commit is contained in:
Florian Müllner 2022-02-11 00:15:27 +01:00 committed by Marge Bot
parent 55a37ac992
commit 928f3288e9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/background.js
View File

@ -101,7 +101,7 @@ const LoginManager = imports.misc.loginManager;
const Main = imports.ui.main; const Main = imports.ui.main;
const Params = imports.misc.params; const Params = imports.misc.params;
Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish'); Gio._promisify(Gio.File.prototype, 'query_info_async', 'query_info_finish');
var DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff); var DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

4
js/ui/environment.js
View File

@ -372,10 +372,10 @@ function init() {
}, },
}); });
Gio._LocalFilePrototype.touch_async = function (callback) { Gio.File.prototype.touch_async = function (callback) {
Shell.util_touch_file_async(this, callback); Shell.util_touch_file_async(this, callback);
}; };
Gio._LocalFilePrototype.touch_finish = function (result) { Gio.File.prototype.touch_finish = function (result) {
return Shell.util_touch_file_finish(this, result); return Shell.util_touch_file_finish(this, result);
}; };

4
js/ui/main.js
View File

@ -100,8 +100,8 @@ let _themeResource = null;
let _oskResource = null; let _oskResource = null;
let _iconResource = null; let _iconResource = null;
Gio._promisify(Gio._LocalFilePrototype, 'delete_async', 'delete_finish'); Gio._promisify(Gio.File.prototype, 'delete_async', 'delete_finish');
Gio._promisify(Gio._LocalFilePrototype, 'touch_async', 'touch_finish'); Gio._promisify(Gio.File.prototype, 'touch_async', 'touch_finish');
let _remoteAccessInhibited = false; let _remoteAccessInhibited = false;