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

endSessionDialog: Use registered D-Bus error

Browse Source 
Instead of returning ad-hoc errors, register a custom error domain
and return appropriate GLib.Errors.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3159>
This commit is contained in:
Florian Müllner 2024-01-31 17:44:05 +01:00
parent 9e96e8495b
commit 8f03eec3a3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/misc/dbusErrors.js
View File

@ -1,4 +1,3 @@
/* eslint-disable no-unused-vars */
import GLib from 'gi://GLib'; import GLib from 'gi://GLib';
import Gio from 'gi://Gio'; import Gio from 'gi://Gio';
@ -27,3 +26,11 @@ function createErrorEnum(errorNames) {
} }
return obj; return obj;
} }
const modalDialogErrorNames = [
'UnknownType',
'GrabFailed',
];
export const ModalDialogErrors =
registerErrorDomain('ModalDialog', modalDialogErrorNames);
export const ModalDialogError = createErrorEnum(modalDialogErrorNames);

10
js/ui/endSessionDialog.js
View File

@ -34,6 +34,8 @@ import * as LoginManager from '../misc/loginManager.js';
import * as ModalDialog from './modalDialog.js'; import * as ModalDialog from './modalDialog.js';
import * as UserWidget from './userWidget.js'; import * as UserWidget from './userWidget.js';
import {ModalDialogErrors, ModalDialogError} from '../misc/dbusErrors.js';
import {loadInterfaceXML} from '../misc/fileUtils.js'; import {loadInterfaceXML} from '../misc/fileUtils.js';
const _ITEM_ICON_SIZE = 64; const _ITEM_ICON_SIZE = 64;
@ -739,8 +741,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._sessionSection.list.destroy_all_children(); this._sessionSection.list.destroy_all_children();
if (!(this._type in DialogContent)) { if (!(this._type in DialogContent)) {
invocation.return_dbus_error( invocation.return_error_literal(ModalDialogErrors,
'org.gnome.Shell.ModalDialog.TypeError', ModalDialogError.UNKNOWN_TYPE,
'Unknown dialog type requested'); 'Unknown dialog type requested');
return; return;
} }
@ -773,8 +775,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._updateButtons(); this._updateButtons();
if (!this.open(timestamp)) { if (!this.open(timestamp)) {
invocation.return_dbus_error( invocation.return_error_literal(
'org.gnome.Shell.ModalDialog.GrabError', ModalDialogError.GRAB_FAILED,
'Cannot grab pointer and keyboard'); 'Cannot grab pointer and keyboard');
return; return;
} }