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

Stop using conditional catch statements

Browse Source 
It is a mozilla extension that is going away in SpiderMonkey 60.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/151
This commit is contained in:
Florian Müllner 2018-07-15 03:17:42 +02:00 committed by Florian Müllner
parent 22392d1328
commit e36ba874a8
4 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/gdm/util.js
View File

@ -350,16 +350,19 @@ var ShellUserVerifier = new Lang.Class({
try { try {
this._clearUserVerifier(); this._clearUserVerifier();
this._userVerifier = client.open_reauthentication_channel_finish(result); this._userVerifier = client.open_reauthentication_channel_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
return;
} catch(e if e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
!this._reauthOnly) {
// Gdm emits org.freedesktop.DBus.Error.AccessDenied when there is
// no session to reauthenticate. Fall back to performing verification
// from this login session
client.get_user_verifier(this._cancellable, this._userVerifierGot.bind(this));
return;
} catch(e) { } catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
return;
if (e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
!this._reauthOnly) {
// Gdm emits org.freedesktop.DBus.Error.AccessDenied when there
// is no session to reauthenticate. Fall back to performing
// verification from this login session
client.get_user_verifier(this._cancellable,
this._userVerifierGot.bind(this));
return;
}
this._reportInitError('Failed to open reauthentication channel', e); this._reportInitError('Failed to open reauthentication channel', e);
return; return;
} }
@ -374,9 +377,9 @@ var ShellUserVerifier = new Lang.Class({
try { try {
this._clearUserVerifier(); this._clearUserVerifier();
this._userVerifier = client.get_user_verifier_finish(result); this._userVerifier = client.get_user_verifier_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
return;
} catch(e) { } catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
return;
this._reportInitError('Failed to obtain user verifier', e); this._reportInitError('Failed to obtain user verifier', e);
return; return;
} }
@ -434,9 +437,9 @@ var ShellUserVerifier = new Lang.Class({
(obj, result) => { (obj, result) => {
try { try {
obj.call_begin_verification_for_user_finish(result); obj.call_begin_verification_for_user_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
return;
} catch(e) { } catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
return;
this._reportInitError('Failed to start verification for user', e); this._reportInitError('Failed to start verification for user', e);
return; return;
} }
@ -449,9 +452,9 @@ var ShellUserVerifier = new Lang.Class({
(obj, result) => { (obj, result) => {
try { try {
obj.call_begin_verification_finish(result); obj.call_begin_verification_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
return;
} catch(e) { } catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
return;
this._reportInitError('Failed to start verification', e); this._reportInitError('Failed to start verification', e);
return; return;
} }

9
js/ui/notificationDaemon.js
View File

@ -831,8 +831,10 @@ var GtkNotificationDaemon = new Lang.Class({
let source; let source;
try { try {
source = this._ensureAppSource(appId); source = this._ensureAppSource(appId);
} catch(e if e instanceof InvalidAppError) { } catch(e) {
if (e instanceof InvalidAppError)
return; return;
throw e;
} }
notifications.forEach(([notificationId, notification]) => { notifications.forEach(([notificationId, notification]) => {
@ -863,10 +865,13 @@ var GtkNotificationDaemon = new Lang.Class({
let source; let source;
try { try {
source = this._ensureAppSource(appId); source = this._ensureAppSource(appId);
} catch(e if e instanceof InvalidAppError) { } catch(e) {
if (e instanceof InvalidAppError) {
invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId)); invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId));
return; return;
} }
throw e;
}
let timestamp = GLib.DateTime.new_now_local().to_unix(); let timestamp = GLib.DateTime.new_now_local().to_unix();
notification['timestamp'] = new GLib.Variant('x', timestamp); notification['timestamp'] = new GLib.Variant('x', timestamp);

5
js/ui/runDialog.js
View File

@ -172,8 +172,9 @@ var RunDialog = new Lang.Class({
if (name.slice(0, text.length) == text) if (name.slice(0, text.length) == text)
results.push(name); results.push(name);
} }
} catch (e if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) && } catch (e) {
!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))) { if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))
log(e); log(e);
} finally { } finally {
return results; return results;

6
js/ui/scripting.js
View File

@ -216,13 +216,15 @@ function _step(g, finish, onError) {
if (onError) if (onError)
onError(err); onError(err);
}); });
} catch (err if err instanceof StopIteration) { } catch (err) {
if (err instanceof StopIteration) {
if (finish) if (finish)
finish(); finish();
} catch (err) { } else {
if (onError) if (onError)
onError(err); onError(err);
} }
}
} }
function _collect(scriptModule, outputFile) { function _collect(scriptModule, outputFile) {