Skip to content

Commit c08b626

Browse files
committed
init timer in enable function, use ExtensionUtils.openPrefs instead of deprecated gnome-shell-extension-prefs spawning
1 parent 9e36640 commit c08b626

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ShutdownTimer@neumann/extension.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ const _ = Gettext.gettext;
2929

3030

3131
// import own scripts
32-
const Extension = imports.misc.extensionUtils.getCurrentExtension();
32+
const ExtensionUtils = imports.misc.extensionUtils;
33+
const Extension = ExtensionUtils.getCurrentExtension();
3334
const Timer = Extension.imports.timer;
3435
const Convenience = Extension.imports.convenience;
3536

@@ -118,7 +119,7 @@ function _createSwitcherItem() {
118119
switcherSettingsButton.child = new St.Icon({icon_name: 'emblem-system-symbolic',
119120
style_class: 'popup-menu-icon' });
120121
switcherSettingsButton.connect('clicked', function () {
121-
Util.spawn(["gnome-shell-extension-prefs", Extension.metadata.uuid]);
122+
ExtensionUtils.openPrefs();
122123
});
123124
switchMenuItem.add_actor(switcherSettingsButton);
124125

@@ -150,12 +151,14 @@ function init() {
150151
// initialize translations
151152
Convenience.initTranslations();
152153

153-
// initialize timer and settings
154+
// initialize settings
154155
settings = Convenience.getSettings();
155-
timer = new Timer.Timer(powerOff);
156156
}
157157

158158
function enable() {
159+
// initialize timer
160+
timer = new Timer.Timer(powerOff);
161+
159162
// submenu in status area menu with slider and toggle button
160163
let sliderItem = _createSliderItem();
161164
switcher = _createSwitcherItem();
@@ -183,4 +186,3 @@ function disable() {
183186
submenu.destroy(); // destroys switcher and sliderItem as children too
184187
separator.destroy();
185188
}
186-

ShutdownTimer@neumann/prefs.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ const ShutdownTimerPrefsWidget = new GObject.Class({
7878
switchMenuItem.set_active(rootMode);
7979
this.attach(switchMenuItem, 0, 7, 1, 1);
8080
}
81-
8281
});
8382

8483
function buildPrefsWidget() {
@@ -88,7 +87,6 @@ function buildPrefsWidget() {
8887
} else {
8988
widget.show();
9089
}
91-
9290

9391
return widget;
9492
}

0 commit comments

Comments
 (0)