From 0cc14fd043b86b3efa507f175723c61f2ed39830 Mon Sep 17 00:00:00 2001 From: mannjani <4688839+mannjani@users.noreply.github.com> Date: Thu, 26 Oct 2023 18:02:14 +0530 Subject: [PATCH] Change imports to support gnome45 in extension.js --- extension.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/extension.js b/extension.js index 3ee3dbf..ed91673 100644 --- a/extension.js +++ b/extension.js @@ -16,13 +16,20 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi; +import Clutter from 'gi://Clutter'; +import Gio from 'gi://Gio'; +import GLib from 'gi://GLib'; +import GObject from 'gi://GObject'; +import Meta from 'gi://Meta'; +import Shell from 'gi://Shell'; +import St from 'gi://St'; const ExtensionUtils = imports.misc.extensionUtils; -const Me = ExtensionUtils.getCurrentExtension(); -const Main = imports.ui.main; -const MessageTray = imports.ui.messageTray.MessageTray; -const Utils = Me.imports.utils; +import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js'; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import MessageTray from 'resource:///org/gnome/shell/ui/messageTray.js'; +import * as Utils from './utils.js'; + const BannerBin = Main.messageTray._bannerBin; const { NOTIFICATION_TIMEOUT, HIDE_TIMEOUT, LONGER_HIDE_TIMEOUT, IDLE_TIME, State, Urgency } = imports.ui.messageTray; @@ -153,14 +160,14 @@ const always_minimize_patch = { patch: "// always minimized setting enabled by notification-banner-reloaded ... this._expandBanner(true)", }; -class Extension { +export default class NotificationExtension extends Extension { constructor() { this._previous_y_align = BannerBin.get_y_align(); this._previous_x_align = BannerBin.get_x_align(); } _loadSettings() { - this._settings = ExtensionUtils.getSettings(); + this._settings = this.getSettings(); this._settingsChangedId = this._settings.connect('changed', this._onSettingsChange.bind(this)); this._fetchSettings(); }