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

main: Instantiate EndSessionDialog

Browse Source 
Using an exported `init()` function to create the object is an odd
pattern, and not having the object referenced anywhere makes it harder
to access for debugging or extensions.

Just export the `EndSessionDialog` class and instantiate it like we
do for other objects.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2997>
This commit is contained in:
Charles Wong 2023-10-28 15:34:36 +08:00 committed by Marge Bot
parent f4c9489585
commit 6ff08fd9bd
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/endSessionDialog.js
View File

@ -223,14 +223,7 @@ function _setCheckBoxLabel(checkBox, text) {
} }
} }
export function init() { export const EndSessionDialog = GObject.registerClass(
// This always returns the same singleton object
// By instantiating it initially, we register the
// bus object, etc.
new EndSessionDialog();
}
const EndSessionDialog = GObject.registerClass(
class EndSessionDialog extends ModalDialog.ModalDialog { class EndSessionDialog extends ModalDialog.ModalDialog {
_init() { _init() {
super._init({ super._init({

3
js/ui/main.js
View File

@ -90,6 +90,7 @@ export let kbdA11yDialog = null;
export let inputMethod = null; export let inputMethod = null;
export let introspectService = null; export let introspectService = null;
export let locatePointer = null; export let locatePointer = null;
export let endSessionDialog = null;
let _startDate; let _startDate;
let _defaultCssStylesheet = null; let _defaultCssStylesheet = null;
@ -275,7 +276,7 @@ async function _initializeUI() {
// Provide the bus object for gnome-session to // Provide the bus object for gnome-session to
// initiate logouts. // initiate logouts.
EndSessionDialog.init(); endSessionDialog = new EndSessionDialog.EndSessionDialog();
// We're ready for the session manager to move to the next phase // We're ready for the session manager to move to the next phase
GLib.idle_add(GLib.PRIORITY_DEFAULT, () => { GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {