From 517d7d2e75bf90d1b7f69fde306a7f4d043b858c Mon Sep 17 00:00:00 2001 From: Philipp Unger Date: Sat, 19 Aug 2023 02:44:53 +0200 Subject: [PATCH] modify Signals import and use addSignalMethods again --- appIcons.js | 4 ++-- extension.js | 4 ++-- progress.js | 6 +++--- taskbar.js | 4 ++-- windowPreview.js | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appIcons.js b/appIcons.js index 931da6a..5c8dbf7 100644 --- a/appIcons.js +++ b/appIcons.js @@ -54,7 +54,7 @@ import {SETTINGS, DESKTOPSETTINGS, EXTENSION_PATH} from './extension.js'; import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; const Mainloop = imports.mainloop; -const Signals = imports.signals; +const {signals: Signals} = imports; //timeout names const T2 = 'mouseScrollTimeout'; @@ -1732,7 +1732,7 @@ export var ShowAppsIconWrapper = class { this.realShowAppsIcon.destroy(); } }; -// Signals.addSignalMethods(ShowAppsIconWrapper.prototype); +Signals.addSignalMethods(ShowAppsIconWrapper.prototype); /** * A menu for the showAppsIcon diff --git a/extension.js b/extension.js index 38f9652..d151b08 100644 --- a/extension.js +++ b/extension.js @@ -34,7 +34,7 @@ import * as AppIcons from './appIcons.js'; import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; const Mainloop = imports.mainloop; -const Signals = imports.signals; +const {signals: Signals} = imports; const UBUNTU_DOCK_UUID = 'ubuntu-dock@ubuntu.com'; @@ -74,7 +74,7 @@ export default class DashToPanelExtension extends Extension { //create a global object that can emit signals and conveniently expose functionalities to other extensions global.dashToPanel = {}; - // Signals.addSignalMethods(global.dashToPanel); + Signals.addSignalMethods(global.dashToPanel); _enable(this); } diff --git a/progress.js b/progress.js index eb16aa2..d22b492 100644 --- a/progress.js +++ b/progress.js @@ -27,7 +27,7 @@ import * as Utils from './utils.js'; import {SETTINGS} from './extension.js'; const Cairo = imports.cairo; -const Signals = imports.signals; +const {signals: Signals} = imports; export var ProgressManager = class { @@ -163,7 +163,7 @@ export var ProgressManager = class { } } }; -// Signals.addSignalMethods(ProgressManager.prototype); +Signals.addSignalMethods(ProgressManager.prototype); export class AppProgress { @@ -278,7 +278,7 @@ export class AppProgress { } } }; -// Signals.addSignalMethods(AppProgress.prototype); +Signals.addSignalMethods(AppProgress.prototype); export var ProgressIndicator = class { diff --git a/taskbar.js b/taskbar.js index 41fad05..6939b67 100644 --- a/taskbar.js +++ b/taskbar.js @@ -51,7 +51,7 @@ import * as WindowPreview from './windowPreview.js'; import {SETTINGS} from './extension.js'; const Mainloop = imports.mainloop; -const Signals = imports.signals; +const {signals: Signals} = imports; var DASH_ANIMATION_TIME = Dash.DASH_ANIMATION_TIME / (Dash.DASH_ANIMATION_TIME > 1 ? 1000 : 1); var DASH_ITEM_HOVER_TIMEOUT = Dash.DASH_ITEM_HOVER_TIMEOUT; @@ -1324,7 +1324,7 @@ export var Taskbar = class { } }; -// Signals.addSignalMethods(Taskbar.prototype); +Signals.addSignalMethods(Taskbar.prototype); const CloneContainerConstraint = GObject.registerClass({ }, class CloneContainerConstraint extends Clutter.BindConstraint { diff --git a/windowPreview.js b/windowPreview.js index d44828a..1f78a1f 100644 --- a/windowPreview.js +++ b/windowPreview.js @@ -33,7 +33,7 @@ import * as Utils from './utils.js'; import {SETTINGS, DESKTOPSETTINGS} from './extension.js'; const Mainloop = imports.mainloop; -const Signals = imports.signals; +const {signals: Signals} = imports; //timeout intervals const ENSURE_VISIBLE_MS = 200;