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

js: Get idle monitor from backend

Browse Source 
Its ownership has moved from dangeling to owned by the backend, which
has reflected the API is accessible by. Adapt to this change.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1838>
This commit is contained in:
Jonas Ådahl 2021-05-06 22:31:11 +02:00 committed by Marge Bot
parent 3c6fd75ab7
commit 08fb067d24
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/magnifier.js
View File

@ -750,7 +750,7 @@ var ZoomRegion = class ZoomRegion {
this._xCaret = 0; this._xCaret = 0;
this._yCaret = 0; this._yCaret = 0;
this._pointerIdleMonitor = Meta.IdleMonitor.get_core(); this._pointerIdleMonitor = global.backend.get_core_idle_monitor();
this._scrollContentsTimerId = 0; this._scrollContentsTimerId = 0;
} }

2
js/ui/messageTray.js
View File

@ -855,7 +855,7 @@ var MessageTray = GObject.registerClass({
this._userActiveWhileNotificationShown = false; this._userActiveWhileNotificationShown = false;
this.idleMonitor = Meta.IdleMonitor.get_core(); this.idleMonitor = global.backend.get_core_idle_monitor();
this._useLongerNotificationLeftTimeout = false; this._useLongerNotificationLeftTimeout = false;

4
js/ui/pointerWatcher.js
View File

@ -1,7 +1,7 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported getPointerWatcher */ /* exported getPointerWatcher */
const { GLib, Meta } = imports.gi; const { GLib } = imports.gi;
// We stop polling if the user is idle for more than this amount of time // We stop polling if the user is idle for more than this amount of time
var IDLE_TIME = 1000; var IDLE_TIME = 1000;
@ -35,7 +35,7 @@ var PointerWatch = class {
var PointerWatcher = class { var PointerWatcher = class {
constructor() { constructor() {
this._idleMonitor = Meta.IdleMonitor.get_core(); this._idleMonitor = global.backend.get_core_idle_monitor();
this._idleMonitor.add_idle_watch(IDLE_TIME, this._onIdleMonitorBecameIdle.bind(this)); this._idleMonitor.add_idle_watch(IDLE_TIME, this._onIdleMonitorBecameIdle.bind(this));
this._idle = this._idleMonitor.get_idletime() > IDLE_TIME; this._idle = this._idleMonitor.get_idletime() > IDLE_TIME;
this._watches = []; this._watches = [];

2
js/ui/screenShield.js
View File

@ -138,7 +138,7 @@ var ScreenShield = class {
fadeFactor: 1 }); fadeFactor: 1 });
this._shortLightbox.connect('notify::active', this._onShortLightbox.bind(this)); this._shortLightbox.connect('notify::active', this._onShortLightbox.bind(this));
this.idleMonitor = Meta.IdleMonitor.get_core(); this.idleMonitor = global.backend.get_core_idle_monitor();
this._cursorTracker = Meta.CursorTracker.get_for_display(global.display); this._cursorTracker = Meta.CursorTracker.get_for_display(global.display);
this._syncInhibitor(); this._syncInhibitor();

4
js/ui/unlockDialog.js
View File

@ -348,7 +348,7 @@ class UnlockDialogClock extends St.BoxLayout {
this._powerModeChangedId = this._monitorManager.connect( this._powerModeChangedId = this._monitorManager.connect(
'power-save-mode-changed', () => (this._hint.opacity = 0)); 'power-save-mode-changed', () => (this._hint.opacity = 0));
this._idleMonitor = Meta.IdleMonitor.get_core(); this._idleMonitor = global.backend.get_core_idle_monitor();
this._idleWatchId = this._idleMonitor.add_idle_watch(HINT_TIMEOUT * 1000, () => { this._idleWatchId = this._idleMonitor.add_idle_watch(HINT_TIMEOUT * 1000, () => {
this._hint.ease({ this._hint.ease({
opacity: 255, opacity: 255,
@ -594,7 +594,7 @@ var UnlockDialog = GObject.registerClass({
this._otherUserButton); this._otherUserButton);
this.add_child(mainBox); this.add_child(mainBox);
this._idleMonitor = Meta.IdleMonitor.get_core(); this._idleMonitor = global.backend.get_core_idle_monitor();
this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, this._escape.bind(this)); this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, this._escape.bind(this));
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));