diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index 5b4347bf..76c0e270 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -11,8 +11,9 @@ import Shell from 'gi://Shell'; import St from 'gi://St'; const {EventEmitter} = imports.misc.signals; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const DND = imports.ui.dnd; -const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; diff --git a/extensions/auto-move-windows/extension.js b/extensions/auto-move-windows/extension.js index 53d614a4..313982a8 100644 --- a/extensions/auto-move-windows/extension.js +++ b/extensions/auto-move-windows/extension.js @@ -3,7 +3,8 @@ import Shell from 'gi://Shell'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; class WindowMover { diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js index fb66a7f1..395fbd9b 100644 --- a/extensions/auto-move-windows/prefs.js +++ b/extensions/auto-move-windows/prefs.js @@ -7,7 +7,7 @@ import GLib from 'gi://GLib'; import GObject from 'gi://GObject'; import Gtk from 'gi://Gtk'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; const _ = ExtensionUtils.gettext; diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js index 8e9f479d..635a19a1 100644 --- a/extensions/drive-menu/extension.js +++ b/extensions/drive-menu/extension.js @@ -5,7 +5,8 @@ import GObject from 'gi://GObject'; import Shell from 'gi://Shell'; import St from 'gi://St'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js index e41bd23b..ce7122d7 100644 --- a/extensions/native-window-placement/extension.js +++ b/extensions/native-window-placement/extension.js @@ -1,7 +1,8 @@ // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*- import Clutter from 'gi://Clutter'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; const {WindowPreview} = imports.ui.windowPreview; const Workspace = imports.ui.workspace; diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js index 159e61ad..2136fd71 100644 --- a/extensions/places-menu/extension.js +++ b/extensions/places-menu/extension.js @@ -3,7 +3,8 @@ import Clutter from 'gi://Clutter'; import GObject from 'gi://GObject'; import St from 'gi://St'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index 7fd96757..abbb6a8f 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -4,11 +4,12 @@ import GLib from 'gi://GLib'; import Shell from 'gi://Shell'; const {EventEmitter} = imports.misc.signals; -const ExtensionUtils = imports.misc.extensionUtils; +import {gettext} from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; const ShellMountOperation = imports.ui.shellMountOperation; -const _ = ExtensionUtils.gettext; +const _ = gettext; const N_ = x => x; Gio._promisify(Gio.AppInfo, 'launch_default_for_uri_async'); diff --git a/extensions/screenshot-window-sizer/extension.js b/extensions/screenshot-window-sizer/extension.js index b7777ab3..3dba8202 100644 --- a/extensions/screenshot-window-sizer/extension.js +++ b/extensions/screenshot-window-sizer/extension.js @@ -23,7 +23,8 @@ import Meta from 'gi://Meta'; import Shell from 'gi://Shell'; import St from 'gi://St'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; const MESSAGE_FADE_TIME = 2000; diff --git a/extensions/user-theme/extension.js b/extensions/user-theme/extension.js index 25f5a876..ea72c16c 100644 --- a/extensions/user-theme/extension.js +++ b/extensions/user-theme/extension.js @@ -3,7 +3,8 @@ import Gio from 'gi://Gio'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const Main = imports.ui.main; import {getThemeDirs, getModeThemeDirs} from './util.js'; diff --git a/extensions/user-theme/prefs.js b/extensions/user-theme/prefs.js index 9d42fd0a..054d528a 100644 --- a/extensions/user-theme/prefs.js +++ b/extensions/user-theme/prefs.js @@ -9,7 +9,7 @@ import GLib from 'gi://GLib'; import GObject from 'gi://GObject'; import Gtk from 'gi://Gtk'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; import {getThemeDirs, getModeThemeDirs} from './util.js'; diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 540a2d90..f7dd8b60 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -7,8 +7,9 @@ import Meta from 'gi://Meta'; import Shell from 'gi://Shell'; import St from 'gi://St'; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const DND = imports.ui.dnd; -const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; const Overview = imports.ui.overview; const PopupMenu = imports.ui.popupMenu; diff --git a/extensions/window-list/prefs.js b/extensions/window-list/prefs.js index 6cdd50d3..68812457 100644 --- a/extensions/window-list/prefs.js +++ b/extensions/window-list/prefs.js @@ -5,7 +5,7 @@ import GLib from 'gi://GLib'; import GObject from 'gi://GObject'; import Gtk from 'gi://Gtk'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; const _ = ExtensionUtils.gettext; diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js index 1f78db0a..6eeea3e7 100644 --- a/extensions/window-list/workspaceIndicator.js +++ b/extensions/window-list/workspaceIndicator.js @@ -4,13 +4,14 @@ import GObject from 'gi://GObject'; import Meta from 'gi://Meta'; import St from 'gi://St'; +import {gettext} from 'resource:///org/gnome/shell/extensions/extension.js'; + const DND = imports.ui.dnd; -const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; -const _ = ExtensionUtils.gettext; +const _ = gettext; const TOOLTIP_OFFSET = 6; const TOOLTIP_ANIMATION_TIME = 150; diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js index d6543599..1c44ba74 100644 --- a/extensions/workspace-indicator/extension.js +++ b/extensions/workspace-indicator/extension.js @@ -5,8 +5,9 @@ import GObject from 'gi://GObject'; import Meta from 'gi://Meta'; import St from 'gi://St'; +import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js'; + const DND = imports.ui.dnd; -const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; diff --git a/extensions/workspace-indicator/prefs.js b/extensions/workspace-indicator/prefs.js index 104926fe..014e7b3a 100644 --- a/extensions/workspace-indicator/prefs.js +++ b/extensions/workspace-indicator/prefs.js @@ -6,7 +6,7 @@ import GObject from 'gi://GObject'; import Gtk from 'gi://Gtk'; import Pango from 'gi://Pango'; -const ExtensionUtils = imports.misc.extensionUtils; +import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; const _ = ExtensionUtils.gettext; const N_ = e => e;