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

js: Use (dis)connectObject()

Browse Source 
Start using the new methods to simplify signal cleanup. For now,
focus on replacing existing cleanups; in most cases this means
signals connected in the constructor and disconnected on destroy,
but also other cases with a similarly defined lifetime (say: from
show to hide).

This doesn't change signal connections that only exist for a short
time (say: once), handlers that are connected on-demand (say: the
first time a particular method is called), or connections that
aren't tracked (read: disconnected) at all.

We will eventually replace the latter with connectObject() as
well - especially from actor subclasses - but the changeset is
already big enough as-is :-)

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1953>
This commit is contained in:
Florian Müllner 2021-08-16 00:36:59 +02:00 committed by Marge Bot
parent f45ccc9143
commit 26235bbe54
54 changed files with 753 additions and 1674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
js/gdm/loginDialog.js
View File

@ -55,10 +55,8 @@ var UserListItem = GObject.registerClass({
}); });
this.user = user; this.user = user;
this._userChangedId = this.user.connect('changed', this.user.connectObject('changed', this._onUserChanged.bind(this), this);
this._onUserChanged.bind(this));
this.connect('destroy', this._onDestroy.bind(this));
this.connect('notify::hover', () => { this.connect('notify::hover', () => {
this._setSelected(this.hover); this._setSelected(this.hover);
}); });
@ -100,10 +98,6 @@ var UserListItem = GObject.registerClass({
this.remove_style_pseudo_class('logged-in'); this.remove_style_pseudo_class('logged-in');
} }
_onDestroy() {
this.user.disconnect(this._userChangedId);
}
vfunc_clicked() { vfunc_clicked() {
this.emit('activate'); this.emit('activate');
} }
@ -441,8 +435,8 @@ var LoginDialog = GObject.registerClass({
this._updateLogo.bind(this)); this._updateLogo.bind(this));
this._textureCache = St.TextureCache.get_default(); this._textureCache = St.TextureCache.get_default();
this._updateLogoTextureId = this._textureCache.connect('texture-file-changed', this._textureCache.connectObject('texture-file-changed',
this._updateLogoTexture.bind(this)); this._updateLogoTexture.bind(this), this);
this._userSelectionBox = new St.BoxLayout({ this._userSelectionBox = new St.BoxLayout({
style_class: 'login-dialog-user-selection-box', style_class: 'login-dialog-user-selection-box',
@ -533,16 +527,16 @@ var LoginDialog = GObject.registerClass({
this._userListLoaded = false; this._userListLoaded = false;
this._realmManager = new Realmd.Manager(); this._realmManager = new Realmd.Manager();
this._realmSignalId = this._realmManager.connect('login-format-changed', this._realmManager.connectObject('login-format-changed',
this._showRealmLoginHint.bind(this)); this._showRealmLoginHint.bind(this), this);
LoginManager.getLoginManager().getCurrentSessionProxy(this._gotGreeterSessionProxy.bind(this)); LoginManager.getLoginManager().getCurrentSessionProxy(this._gotGreeterSessionProxy.bind(this));
// If the user list is enabled, it should take key focus; make sure the // If the user list is enabled, it should take key focus; make sure the
// screen shield is initialized first to prevent it from stealing the // screen shield is initialized first to prevent it from stealing the
// focus later // focus later
this._startupCompleteId = Main.layoutManager.connect('startup-complete', Main.layoutManager.connectObject('startup-complete',
this._updateDisableUserList.bind(this)); this._updateDisableUserList.bind(this), this);
} }
_getBannerAllocation(dialogBox) { _getBannerAllocation(dialogBox) {
@ -755,12 +749,11 @@ var LoginDialog = GObject.registerClass({
_ensureUserListLoaded() { _ensureUserListLoaded() {
if (!this._userManager.is_loaded) { if (!this._userManager.is_loaded) {
this._userManagerLoadedId = this._userManager.connect('notify::is-loaded', this._userManager.connectObject('notify::is-loaded',
() => { () => {
if (this._userManager.is_loaded) { if (this._userManager.is_loaded) {
this._userManager.disconnectObject(this);
this._loadUserList(); this._loadUserList();
this._userManager.disconnect(this._userManagerLoadedId);
this._userManagerLoadedId = 0;
} }
}); });
} else { } else {
@ -864,12 +857,10 @@ var LoginDialog = GObject.registerClass({
this._greeter = this._gdmClient.get_greeter_sync(null); this._greeter = this._gdmClient.get_greeter_sync(null);
this._defaultSessionChangedId = this._greeter.connect('default-session-name-changed', this._greeter.connectObject(
this._onDefaultSessionChanged.bind(this)); 'default-session-name-changed', this._onDefaultSessionChanged.bind(this),
this._sessionOpenedId = this._greeter.connect('session-opened', 'session-opened', this._onSessionOpened.bind(this),
this._onSessionOpened.bind(this)); 'timed-login-requested', this._onTimedLoginRequested.bind(this), this);
this._timedLoginRequestedId = this._greeter.connect('timed-login-requested',
this._onTimedLoginRequested.bind(this));
} }
} }
@ -994,11 +985,10 @@ var LoginDialog = GObject.registerClass({
_gotGreeterSessionProxy(proxy) { _gotGreeterSessionProxy(proxy) {
this._greeterSessionProxy = proxy; this._greeterSessionProxy = proxy;
this._greeterSessionProxyChangedId = proxy.connectObject('g-properties-changed', () => {
proxy.connect('g-properties-changed', () => {
if (proxy.Active) if (proxy.Active)
this._loginScreenSessionActivated(); this._loginScreenSessionActivated();
}); }, this);
} }
_startSession(serviceName) { _startSession(serviceName) {
@ -1214,45 +1204,15 @@ var LoginDialog = GObject.registerClass({
} }
_onDestroy() { _onDestroy() {
if (this._userManagerLoadedId) {
this._userManager.disconnect(this._userManagerLoadedId);
this._userManagerLoadedId = 0;
}
if (this._userAddedId) {
this._userManager.disconnect(this._userAddedId);
this._userAddedId = 0;
}
if (this._userRemovedId) {
this._userManager.disconnect(this._userRemovedId);
this._userRemovedId = 0;
}
if (this._userChangedId) {
this._userManager.disconnect(this._userChangedId);
this._userChangedId = 0;
}
this._textureCache.disconnect(this._updateLogoTextureId);
Main.layoutManager.disconnect(this._startupCompleteId);
if (this._settings) { if (this._settings) {
this._settings.run_dispose(); this._settings.run_dispose();
this._settings = null; this._settings = null;
} }
if (this._greeter) {
this._greeter.disconnect(this._defaultSessionChangedId);
this._greeter.disconnect(this._sessionOpenedId);
this._greeter.disconnect(this._timedLoginRequestedId);
this._greeter = null; this._greeter = null;
}
if (this._greeterSessionProxy) {
this._greeterSessionProxy.disconnect(this._greeterSessionProxyChangedId);
this._greeterSessionProxy = null; this._greeterSessionProxy = null;
} this._realmManager?.release();
if (this._realmManager) {
this._realmManager.disconnect(this._realmSignalId);
this._realmSignalId = 0;
this._realmManager.release();
this._realmManager = null; this._realmManager = null;
} }
}
_loadUserList() { _loadUserList() {
if (this._userListLoaded) if (this._userListLoaded)
@ -1267,26 +1227,22 @@ var LoginDialog = GObject.registerClass({
this._updateDisableUserList(); this._updateDisableUserList();
this._userAddedId = this._userManager.connect('user-added', this._userManager.connectObject(
(userManager, user) => { 'user-added', (userManager, user) => {
this._userList.addUser(user); this._userList.addUser(user);
this._updateDisableUserList(); this._updateDisableUserList();
}); },
'user-removed', (userManager, user) => {
this._userRemovedId = this._userManager.connect('user-removed',
(userManager, user) => {
this._userList.removeUser(user); this._userList.removeUser(user);
this._updateDisableUserList(); this._updateDisableUserList();
}); },
'user-changed', (userManager, user) => {
this._userChangedId = this._userManager.connect('user-changed',
(userManager, user) => {
if (this._userList.containsUser(user) && user.locked) if (this._userList.containsUser(user) && user.locked)
this._userList.removeUser(user); this._userList.removeUser(user);
else if (!this._userList.containsUser(user) && !user.locked) else if (!this._userList.containsUser(user) && !user.locked)
this._userList.addUser(user); this._userList.addUser(user);
this._updateDisableUserList(); this._updateDisableUserList();
}); }, this);
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
} }

6
js/gdm/realmd.js
View File

@ -23,11 +23,11 @@ var Manager = class {
this._realms = {}; this._realms = {};
this._loginFormat = null; this._loginFormat = null;
this._signalId = this._aggregateProvider.connect('g-properties-changed', this._aggregateProvider.connectObject('g-properties-changed',
(proxy, properties) => { (proxy, properties) => {
if ('Realms' in properties.deep_unpack()) if ('Realms' in properties.deep_unpack())
this._reloadRealms(); this._reloadRealms();
}); }, this);
} }
_reloadRealms() { _reloadRealms() {
@ -100,7 +100,7 @@ var Manager = class {
'org.freedesktop.realmd', 'org.freedesktop.realmd',
'/org/freedesktop/realmd', '/org/freedesktop/realmd',
service => service.ReleaseRemote()); service => service.ReleaseRemote());
this._aggregateProvider.disconnect(this._signalId); this._aggregateProvider.disconnectObject(this);
this._realms = { }; this._realms = { };
this._updateLoginFormat(); this._updateLoginFormat();
} }

56
js/gdm/util.js
View File

@ -165,10 +165,9 @@ var ShellUserVerifier = class {
this.smartcardDetected = false; this.smartcardDetected = false;
this._checkForSmartcard(); this._checkForSmartcard();
this._smartcardInsertedId = this._smartcardManager.connect('smartcard-inserted', this._smartcardManager.connectObject(
this._checkForSmartcard.bind(this)); 'smartcard-inserted', this._checkForSmartcard.bind(this),
this._smartcardRemovedId = this._smartcardManager.connect('smartcard-removed', 'smartcard-removed', this._checkForSmartcard.bind(this), this);
this._checkForSmartcard.bind(this));
this._messageQueue = []; this._messageQueue = [];
this._messageQueueTimeoutId = 0; this._messageQueueTimeoutId = 0;
@ -187,9 +186,8 @@ var ShellUserVerifier = class {
this._credentialManagers[service].token); this._credentialManagers[service].token);
} }
this._credentialManagers[service]._authenticatedSignalId = this._credentialManagers[service].connectObject('user-authenticated',
this._credentialManagers[service].connect('user-authenticated', this._onCredentialManagerAuthenticated.bind(this), this);
this._onCredentialManagerAuthenticated.bind(this));
} }
} }
@ -259,13 +257,12 @@ var ShellUserVerifier = class {
this._settings.run_dispose(); this._settings.run_dispose();
this._settings = null; this._settings = null;
this._smartcardManager.disconnect(this._smartcardInsertedId); this._smartcardManager.disconnectObject(this);
this._smartcardManager.disconnect(this._smartcardRemovedId);
this._smartcardManager = null; this._smartcardManager = null;
for (let service in this._credentialManagers) { for (let service in this._credentialManagers) {
let credentialManager = this._credentialManagers[service]; let credentialManager = this._credentialManagers[service];
credentialManager.disconnect(credentialManager._authenticatedSignalId); credentialManager.disconnectObject(this);
credentialManager = null; credentialManager = null;
} }
} }
@ -495,35 +492,26 @@ var ShellUserVerifier = class {
_connectSignals() { _connectSignals() {
this._disconnectSignals(); this._disconnectSignals();
this._signalIds = [];
let id = this._userVerifier.connect('info', this._onInfo.bind(this)); this._userVerifier.connectObject(
this._signalIds.push(id); 'info', this._onInfo.bind(this),
id = this._userVerifier.connect('problem', this._onProblem.bind(this)); 'problem', this._onProblem.bind(this),
this._signalIds.push(id); 'info-query', this._onInfoQuery.bind(this),
id = this._userVerifier.connect('info-query', this._onInfoQuery.bind(this)); 'secret-info-query', this._onSecretInfoQuery.bind(this),
this._signalIds.push(id); 'conversation-stopped', this._onConversationStopped.bind(this),
id = this._userVerifier.connect('secret-info-query', this._onSecretInfoQuery.bind(this)); 'service-unavailable', this._onServiceUnavailable.bind(this),
this._signalIds.push(id); 'reset', this._onReset.bind(this),
id = this._userVerifier.connect('conversation-stopped', this._onConversationStopped.bind(this)); 'verification-complete', this._onVerificationComplete.bind(this),
this._signalIds.push(id); this);
id = this._userVerifier.connect('service-unavailable', this._onServiceUnavailable.bind(this));
this._signalIds.push(id);
id = this._userVerifier.connect('reset', this._onReset.bind(this));
this._signalIds.push(id);
id = this._userVerifier.connect('verification-complete', this._onVerificationComplete.bind(this));
this._signalIds.push(id);
if (this._userVerifierChoiceList) if (this._userVerifierChoiceList) {
this._userVerifierChoiceList.connect('choice-query', this._onChoiceListQuery.bind(this)); this._userVerifierChoiceList.connectObject('choice-query',
this._onChoiceListQuery.bind(this), this);
}
} }
_disconnectSignals() { _disconnectSignals() {
if (!this._signalIds || !this._userVerifier) this._userVerifier?.disconnectObject(this);
return;
this._signalIds.forEach(s => this._userVerifier.disconnect(s));
this._signalIds = [];
} }
_getForegroundService() { _getForegroundService() {

7
js/misc/util.js
View File

@ -315,10 +315,9 @@ function createTimeLabel(date, params) {
_desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' }); _desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
let label = new St.Label({ text: formatTime(date, params) }); let label = new St.Label({ text: formatTime(date, params) });
let id = _desktopSettings.connect('changed::clock-format', () => { _desktopSettings.connectObject(
label.text = formatTime(date, params); 'changed::clock-format', () => (label.text = formatTime(date, params)),
}); label);
label.connect('destroy', () => _desktopSettings.disconnect(id));
return label; return label;
} }

38
js/ui/altTab.js
View File

@ -400,7 +400,6 @@ class CyclerHighlight extends St.Widget {
_init() { _init() {
super._init({ layout_manager: new Clutter.BinLayout() }); super._init({ layout_manager: new Clutter.BinLayout() });
this._window = null; this._window = null;
this._sizeChangedId = 0;
this._clone = new Clutter.Clone(); this._clone = new Clutter.Clone();
this.add_actor(this._clone); this.add_actor(this._clone);
@ -421,8 +420,7 @@ class CyclerHighlight extends St.Widget {
if (this._window == w) if (this._window == w)
return; return;
if (this._sizeChangedId) this._window?.disconnectObject(this);
this._window.disconnect(this._sizeChangedId);
this._window = w; this._window = w;
@ -438,8 +436,8 @@ class CyclerHighlight extends St.Widget {
if (this._window) { if (this._window) {
this._onSizeChanged(); this._onSizeChanged();
this._sizeChangedId = this._window.connect('size-changed', this._window.connectObject('size-changed',
this._onSizeChanged.bind(this)); this._onSizeChanged.bind(this), this);
} else { } else {
this._highlight.set_size(0, 0); this._highlight.set_size(0, 0);
this._highlight.hide(); this._highlight.hide();
@ -723,9 +721,8 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
if (this._mouseTimeOutId != 0) if (this._mouseTimeOutId != 0)
GLib.source_remove(this._mouseTimeOutId); GLib.source_remove(this._mouseTimeOutId);
this.icons.forEach(icon => { this.icons.forEach(
icon.app.disconnect(icon._stateChangedId); icon => icon.app.disconnectObject(this));
});
} }
_setIconSize() { _setIconSize() {
@ -868,10 +865,10 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
this.icons.push(appIcon); this.icons.push(appIcon);
let item = this.addItem(appIcon, appIcon.label); let item = this.addItem(appIcon, appIcon.label);
appIcon._stateChangedId = appIcon.app.connect('notify::state', app => { appIcon.app.connectObject('notify::state', app => {
if (app.state != Shell.AppState.RUNNING) if (app.state != Shell.AppState.RUNNING)
this._removeIcon(app); this._removeIcon(app);
}); }, this);
let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' }); let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
arrow.connect('repaint', () => SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM)); arrow.connect('repaint', () => SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM));
@ -962,9 +959,8 @@ class ThumbnailSwitcher extends SwitcherPopup.SwitcherList {
this._thumbnailBins[i].set_height(binHeight); this._thumbnailBins[i].set_height(binHeight);
this._thumbnailBins[i].add_actor(clone); this._thumbnailBins[i].add_actor(clone);
clone._destroyId = mutterWindow.connect('destroy', source => { mutterWindow.connectObject('destroy',
this._removeThumbnail(source, clone); source => this._removeThumbnail(source, clone), this);
});
this._clones.push(clone); this._clones.push(clone);
} }
@ -989,10 +985,8 @@ class ThumbnailSwitcher extends SwitcherPopup.SwitcherList {
} }
_onDestroy() { _onDestroy() {
this._clones.forEach(clone => { this._clones.forEach(
if (clone.source) clone => clone?.source.disconnectObject(this));
clone.source.disconnect(clone._destroyId);
});
} }
}); });
@ -1077,18 +1071,16 @@ class WindowSwitcher extends SwitcherPopup.SwitcherList {
this.addItem(icon, icon.label); this.addItem(icon, icon.label);
this.icons.push(icon); this.icons.push(icon);
icon._unmanagedSignalId = icon.window.connect('unmanaged', window => { icon.window.connectObject('unmanaged',
this._removeWindow(window); window => this._removeWindow(window), this);
});
} }
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }
_onDestroy() { _onDestroy() {
this.icons.forEach(icon => { this.icons.forEach(
icon.window.disconnect(icon._unmanagedSignalId); icon => icon.window.disconnectObject(this));
});
} }
vfunc_get_preferred_height(forWidth) { vfunc_get_preferred_height(forWidth) {

9
js/ui/animation.js
View File

@ -22,11 +22,11 @@ class Animation extends St.Bin {
this.connect('resource-scale-changed', this.connect('resource-scale-changed',
this._loadFile.bind(this, file, width, height)); this._loadFile.bind(this, file, width, height));
this._scaleChangedId = themeContext.connect('notify::scale-factor', themeContext.connectObject('notify::scale-factor',
() => { () => {
this._loadFile(file, width, height); this._loadFile(file, width, height);
this.set_size(width * themeContext.scale_factor, height * themeContext.scale_factor); this.set_size(width * themeContext.scale_factor, height * themeContext.scale_factor);
}); }, this);
this._speed = speed; this._speed = speed;
@ -122,11 +122,6 @@ class Animation extends St.Bin {
_onDestroy() { _onDestroy() {
this.stop(); this.stop();
let themeContext = St.ThemeContext.get_for_stage(global.stage);
if (this._scaleChangedId)
themeContext.disconnect(this._scaleChangedId);
this._scaleChangedId = 0;
} }
}); });

89
js/ui/appDisplay.js
View File

@ -330,15 +330,13 @@ var BaseAppView = GObject.registerClass({
// Filter the apps through the user’s parental controls. // Filter the apps through the user’s parental controls.
this._parentalControlsManager = ParentalControlsManager.getDefault(); this._parentalControlsManager = ParentalControlsManager.getDefault();
this._appFilterChangedId = this._parentalControlsManager.connectObject('app-filter-changed',
this._parentalControlsManager.connect('app-filter-changed', () => { () => this._redisplay(), this);
this._redisplay();
});
// Don't duplicate favorites // Don't duplicate favorites
this._appFavorites = AppFavorites.getAppFavorites(); this._appFavorites = AppFavorites.getAppFavorites();
this._appFavoritesChangedId = this._appFavorites.connectObject('changed',
this._appFavorites.connect('changed', () => this._redisplay()); () => this._redisplay(), this);
// Drag n' Drop // Drag n' Drop
this._lastOvershoot = -1; this._lastOvershoot = -1;
@ -355,16 +353,6 @@ var BaseAppView = GObject.registerClass({
} }
_onDestroy() { _onDestroy() {
if (this._appFilterChangedId > 0) {
this._parentalControlsManager.disconnect(this._appFilterChangedId);
this._appFilterChangedId = 0;
}
if (this._appFavoritesChangedId > 0) {
this._appFavorites.disconnect(this._appFavoritesChangedId);
this._appFavoritesChangedId = 0;
}
if (this._swipeTracker) { if (this._swipeTracker) {
this._swipeTracker.destroy(); this._swipeTracker.destroy();
delete this._swipeTracker; delete this._swipeTracker;
@ -1165,14 +1153,9 @@ var BaseAppView = GObject.registerClass({
return (translationX - baseOffset) * page; return (translationX - baseOffset) * page;
} }
_getPagePreviewAdjustment(page) {
const previewedPage = this._previewedPages.get(page);
return previewedPage?.adjustment;
}
_syncClip() { _syncClip() {
const nextPageAdjustment = this._getPagePreviewAdjustment(1); const nextPageAdjustment = this._previewedPages.get(1);
const prevPageAdjustment = this._getPagePreviewAdjustment(-1); const prevPageAdjustment = this._previewedPages.get(-1);
this._grid.clip_to_view = this._grid.clip_to_view =
(!prevPageAdjustment || prevPageAdjustment.value === 0) && (!prevPageAdjustment || prevPageAdjustment.value === 0) &&
(!nextPageAdjustment || nextPageAdjustment.value === 0); (!nextPageAdjustment || nextPageAdjustment.value === 0);
@ -1180,7 +1163,7 @@ var BaseAppView = GObject.registerClass({
_setupPagePreview(page, state) { _setupPagePreview(page, state) {
if (this._previewedPages.has(page)) if (this._previewedPages.has(page))
return this._previewedPages.get(page).adjustment; return this._previewedPages.get(page);
const adjustment = new St.Adjustment({ const adjustment = new St.Adjustment({
actor: this, actor: this,
@ -1191,7 +1174,7 @@ var BaseAppView = GObject.registerClass({
const indicator = page > 0 const indicator = page > 0
? this._nextPageIndicator : this._prevPageIndicator; ? this._nextPageIndicator : this._prevPageIndicator;
const notifyId = adjustment.connect('notify::value', () => { adjustment.connectObject('notify::value', () => {
const nextPage = this._grid.currentPage + page; const nextPage = this._grid.currentPage + page;
const hasFollowingPage = nextPage >= 0 && const hasFollowingPage = nextPage >= 0 &&
nextPage < this._grid.nPages; nextPage < this._grid.nPages;
@ -1229,23 +1212,20 @@ var BaseAppView = GObject.registerClass({
}); });
} }
this._syncClip(); this._syncClip();
}); }, this);
this._previewedPages.set(page, { this._previewedPages.set(page, adjustment);
adjustment,
notifyId,
});
return adjustment; return adjustment;
} }
_teardownPagePreview(page) { _teardownPagePreview(page) {
const previewedPage = this._previewedPages.get(page); const adjustment = this._previewedPages.get(page);
if (!previewedPage) if (!adjustment)
return; return;
previewedPage.adjustment.value = 1; adjustment.value = 1;
previewedPage.adjustment.disconnect(previewedPage.notifyId); adjustment.disconnectObject(this);
this._previewedPages.delete(page); this._previewedPages.delete(page);
} }
@ -1266,7 +1246,7 @@ var BaseAppView = GObject.registerClass({
this._prevPageIndicator.remove_style_class_name('dnd'); this._prevPageIndicator.remove_style_class_name('dnd');
} }
adjustment = this._getPagePreviewAdjustment(1); adjustment = this._previewedPages.get(1);
if (showingNextPage) { if (showingNextPage) {
adjustment = this._setupPagePreview(1, state); adjustment = this._setupPagePreview(1, state);
@ -1289,7 +1269,7 @@ var BaseAppView = GObject.registerClass({
}); });
} }
adjustment = this._getPagePreviewAdjustment(-1); adjustment = this._previewedPages.get(-1);
if (showingPrevPage) { if (showingPrevPage) {
adjustment = this._setupPagePreview(-1, state); adjustment = this._setupPagePreview(-1, state);
@ -1403,7 +1383,6 @@ class AppDisplay extends BaseAppView {
this._currentDialog = null; this._currentDialog = null;
this._displayingDialog = false; this._displayingDialog = false;
this._currentDialogDestroyId = 0;
this._placeholder = null; this._placeholder = null;
@ -1698,19 +1677,14 @@ class AppDisplay extends BaseAppView {
addFolderDialog(dialog) { addFolderDialog(dialog) {
Main.layoutManager.overviewGroup.add_child(dialog); Main.layoutManager.overviewGroup.add_child(dialog);
dialog.connect('open-state-changed', (o, isOpen) => { dialog.connect('open-state-changed', (o, isOpen) => {
if (this._currentDialog) { this._currentDialog?.disconnectObject(this);
this._currentDialog.disconnect(this._currentDialogDestroyId);
this._currentDialogDestroyId = 0;
}
this._currentDialog = null; this._currentDialog = null;
if (isOpen) { if (isOpen) {
this._currentDialog = dialog; this._currentDialog = dialog;
this._currentDialogDestroyId = dialog.connect('destroy', () => { this._currentDialog.connectObject('destroy',
this._currentDialog = null; () => (this._currentDialog = null), this);
this._currentDialogDestroyId = 0;
});
} }
this._displayingDialog = isOpen; this._displayingDialog = isOpen;
}); });
@ -2418,8 +2392,8 @@ var FolderIcon = GObject.registerClass({
this.view = new FolderView(this._folder, id, parentView); this.view = new FolderView(this._folder, id, parentView);
this._folderChangedId = this._folder.connect( this._folder.connectObject(
'changed', this._sync.bind(this)); 'changed', this._sync.bind(this), this);
this._sync(); this._sync();
} }
@ -2430,11 +2404,6 @@ var FolderIcon = GObject.registerClass({
this._dialog.destroy(); this._dialog.destroy();
else else
this.view.destroy(); this.view.destroy();
if (this._folderChangedId) {
this._folder.disconnect(this._folderChangedId);
delete this._folderChangedId;
}
} }
vfunc_clicked() { vfunc_clicked() {
@ -3110,9 +3079,8 @@ var AppIcon = GObject.registerClass({
this._menuManager = new PopupMenu.PopupMenuManager(this); this._menuManager = new PopupMenu.PopupMenuManager(this);
this._menuTimeoutId = 0; this._menuTimeoutId = 0;
this._stateChangedId = this.app.connect('notify::state', () => { this.app.connectObject('notify::state',
this._updateRunningStyle(); () => this._updateRunningStyle(), this);
});
this._updateRunningStyle(); this._updateRunningStyle();
} }
@ -3123,10 +3091,7 @@ var AppIcon = GObject.registerClass({
GLib.source_remove(this._folderPreviewId); GLib.source_remove(this._folderPreviewId);
this._folderPreviewId = 0; this._folderPreviewId = 0;
} }
if (this._stateChangedId > 0)
this.app.disconnect(this._stateChangedId);
this._stateChangedId = 0;
this._removeMenuTimeout(); this._removeMenuTimeout();
} }
@ -3221,12 +3186,8 @@ var AppIcon = GObject.registerClass({
if (!isPoppedUp) if (!isPoppedUp)
this._onMenuPoppedDown(); this._onMenuPoppedDown();
}); });
let id = Main.overview.connect('hiding', () => { Main.overview.connectObject('hiding',
this._menu.close(); () => this._menu.close(), this);
});
this.connect('destroy', () => {
Main.overview.disconnect(id);
});
Main.uiGroup.add_actor(this._menu.actor); Main.uiGroup.add_actor(this._menu.actor);
this._menuManager.addMenu(this._menu); this._menuManager.addMenu(this._menu);

64
js/ui/appMenu.js
View File

@ -95,32 +95,25 @@ var AppMenu = class AppMenu extends PopupMenu.PopupMenu {
this._quitItem = this._quitItem =
this.addAction(_('Quit'), () => this._app.request_quit()); this.addAction(_('Quit'), () => this._app.request_quit());
this._signals = []; this._appSystem.connectObject(
this._signals.push([ 'installed-changed', () => this._updateDetailsVisibility(),
this._appSystem, 'app-state-changed', this._onAppStateChanged.bind(this),
this._appSystem.connect('installed-changed', this.actor);
() => this._updateDetailsVisibility()),
], [ this._parentalControlsManager.connectObject(
this._appSystem, 'app-filter-changed', () => this._updateFavoriteItem(), this.actor);
this._appSystem.connect('app-state-changed',
this._onAppStateChanged.bind(this)), this._appFavorites.connectObject(
], [ 'changed', () => this._updateFavoriteItem(), this.actor);
this._parentalControlsManager,
this._parentalControlsManager.connect('app-filter-changed', global.settings.connectObject(
() => this._updateFavoriteItem()), 'writable-changed::favorite-apps', () => this._updateFavoriteItem(),
], [ this.actor);
this._appFavorites,
this._appFavorites.connect('changed', global.connectObject(
() => this._updateFavoriteItem()), 'notify::switcheroo-control', () => this._updateGpuItem(),
], [ this.actor);
global.settings,
global.settings.connect('writable-changed::favorite-apps',
() => this._updateFavoriteItem()),
], [
global,
global.connect('notify::switcheroo-control',
() => this._updateGpuItem()),
]);
this._updateQuitItem(); this._updateQuitItem();
this._updateFavoriteItem(); this._updateFavoriteItem();
this._updateGpuItem(); this._updateGpuItem();
@ -202,10 +195,6 @@ var AppMenu = class AppMenu extends PopupMenu.PopupMenu {
destroy() { destroy() {
super.destroy(); super.destroy();
for (const [obj, id] of this._signals)
obj.disconnect(id);
this._signals = [];
this.setApp(null); this.setApp(null);
} }
@ -225,16 +214,12 @@ var AppMenu = class AppMenu extends PopupMenu.PopupMenu {
if (this._app === app) if (this._app === app)
return; return;
if (this._windowsChangedId) this._app?.disconnectObject(this);
this._app.disconnect(this._windowsChangedId);
this._windowsChangedId = 0;
this._app = app; this._app = app;
if (app) { this._app?.connectObject('windows-changed',
this._windowsChangedId = app.connect('windows-changed', () => this._queueUpdateWindowsSection(), this);
() => this._queueUpdateWindowsSection());
}
this._updateWindowsSection(); this._updateWindowsSection();
@ -293,10 +278,9 @@ var AppMenu = class AppMenu extends PopupMenu.PopupMenu {
const item = this._windowSection.addAction(title, event => { const item = this._windowSection.addAction(title, event => {
Main.activateWindow(window, event.get_time()); Main.activateWindow(window, event.get_time());
}); });
const id = window.connect('notify::title', () => { window.connectObject('notify::title', () => {
item.label.text = window.title || this._app.get_name(); item.label.text = window.title || this._app.get_name();
}); }, item);
item.connect('destroy', () => window.disconnect(id));
}); });
} }
}; };

36
js/ui/background.js
View File

@ -255,26 +255,25 @@ var Background = GObject.registerClass({
this._interfaceSettings = new Gio.Settings({ schema_id: INTERFACE_SCHEMA }); this._interfaceSettings = new Gio.Settings({ schema_id: INTERFACE_SCHEMA });
this._clock = new GnomeDesktop.WallClock(); this._clock = new GnomeDesktop.WallClock();
this._timezoneChangedId = this._clock.connect('notify::timezone', this._clock.connectObject('notify::timezone',
() => { () => {
if (this._animation) if (this._animation)
this._loadAnimation(this._animation.file); this._loadAnimation(this._animation.file);
}); }, this);
let loginManager = LoginManager.getLoginManager(); let loginManager = LoginManager.getLoginManager();
this._prepareForSleepId = loginManager.connect('prepare-for-sleep', loginManager.connectObject('prepare-for-sleep',
(lm, aboutToSuspend) => { (lm, aboutToSuspend) => {
if (aboutToSuspend) if (aboutToSuspend)
return; return;
this._refreshAnimation(); this._refreshAnimation();
}); }, this);
this._settingsChangedSignalId = this._settings.connectObject('changed',
this._settings.connect('changed', this._emitChangedSignal.bind(this)); this._emitChangedSignal.bind(this), this);
this._colorSchemeChangedSignalId = this._interfaceSettings.connectObject(`changed::${COLOR_SCHEME_KEY}`,
this._interfaceSettings.connect(`changed::${COLOR_SCHEME_KEY}`, this._emitChangedSignal.bind(this), this);
this._emitChangedSignal.bind(this));
this._load(); this._load();
} }
@ -290,23 +289,12 @@ var Background = GObject.registerClass({
this._fileWatches = null; this._fileWatches = null;
if (this._timezoneChangedId != 0) this._clock.disconnectObject(this);
this._clock.disconnect(this._timezoneChangedId);
this._timezoneChangedId = 0;
this._clock = null; this._clock = null;
if (this._prepareForSleepId != 0) LoginManager.getLoginManager().disconnectObject(this);
LoginManager.getLoginManager().disconnect(this._prepareForSleepId); this._settings.disconnectObject(this);
this._prepareForSleepId = 0; this._interfaceSettings.disconnectObject(this);
if (this._settingsChangedSignalId != 0)
this._settings.disconnect(this._settingsChangedSignalId);
this._settingsChangedSignalId = 0;
if (this._colorSchemeChangedSignalId !== 0)
this._interfaceSettings.disconnect(this._colorSchemeChangedSignalId);
this._colorSchemeChangedSignalId = 0;
if (this._changedIdleId) { if (this._changedIdleId) {
GLib.source_remove(this._changedIdleId); GLib.source_remove(this._changedIdleId);

6
js/ui/backgroundMenu.js
View File

@ -56,14 +56,12 @@ function addBackgroundMenu(actor, layoutManager) {
}); });
actor.add_action(clickAction); actor.add_action(clickAction);
let grabOpBeginId = global.display.connect('grab-op-begin', () => { global.display.connectObject('grab-op-begin',
clickAction.release(); () => clickAction.release(), actor);
});
actor.connect('destroy', () => { actor.connect('destroy', () => {
actor._backgroundMenu.destroy(); actor._backgroundMenu.destroy();
actor._backgroundMenu = null; actor._backgroundMenu = null;
actor._backgroundManager = null; actor._backgroundManager = null;
global.display.disconnect(grabOpBeginId);
}); });
} }

22
js/ui/boxpointer.js
View File

@ -55,8 +55,6 @@ var BoxPointer = GObject.registerClass({
else else
Meta.enable_unredirect_for_display(global.display); Meta.enable_unredirect_for_display(global.display);
}); });
this.connect('destroy', this._onDestroy.bind(this));
} }
vfunc_captured_event(event) { vfunc_captured_event(event) {
@ -74,13 +72,6 @@ var BoxPointer = GObject.registerClass({
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
} }
_onDestroy() {
if (this._sourceActorDestroyId) {
this._sourceActor.disconnect(this._sourceActorDestroyId);
delete this._sourceActorDestroyId;
}
}
get arrowSide() { get arrowSide() {
return this._arrowSide; return this._arrowSide;
} }
@ -439,19 +430,12 @@ var BoxPointer = GObject.registerClass({
setPosition(sourceActor, alignment) { setPosition(sourceActor, alignment) {
if (!this._sourceActor || sourceActor != this._sourceActor) { if (!this._sourceActor || sourceActor != this._sourceActor) {
if (this._sourceActorDestroyId) { this._sourceActor?.disconnectObject(this);
this._sourceActor.disconnect(this._sourceActorDestroyId);
delete this._sourceActorDestroyId;
}
this._sourceActor = sourceActor; this._sourceActor = sourceActor;
if (this._sourceActor) { this._sourceActor?.connectObject('destroy',
this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => { () => (this._sourceActor = null), this);
this._sourceActor = null;
delete this._sourceActorDestroyId;
});
}
} }
this._arrowAlignment = alignment; this._arrowAlignment = alignment;

82
js/ui/calendar.js
View File

@ -753,14 +753,13 @@ class NotificationMessage extends MessageList.Message {
if (this.notification) if (this.notification)
this.notification.destroy(MessageTray.NotificationDestroyedReason.DISMISSED); this.notification.destroy(MessageTray.NotificationDestroyedReason.DISMISSED);
}); });
this._destroyId = notification.connect('destroy', () => { notification.connectObject(
this._disconnectNotificationSignals(); 'updated', this._onUpdated.bind(this),
'destroy', () => {
this.notification = null; this.notification = null;
if (!this._closed) if (!this._closed)
this.close(); this.close();
}); }, this);
this._updatedId =
notification.connect('updated', this._onUpdated.bind(this));
} }
_getIcon() { _getIcon() {
@ -785,21 +784,6 @@ class NotificationMessage extends MessageList.Message {
this.notification.activate(); this.notification.activate();
} }
_onDestroy() {
super._onDestroy();
this._disconnectNotificationSignals();
}
_disconnectNotificationSignals() {
if (this._updatedId)
this.notification.disconnect(this._updatedId);
this._updatedId = 0;
if (this._destroyId)
this.notification.disconnect(this._destroyId);
this._destroyId = 0;
}
canClose() { canClose() {
return true; return true;
} }
@ -827,7 +811,6 @@ class NotificationSection extends MessageList.MessageListSection {
_init() { _init() {
super._init(); super._init();
this._sources = new Map();
this._nUrgent = 0; this._nUrgent = 0;
Main.messageTray.connect('source-added', this._sourceAdded.bind(this)); Main.messageTray.connect('source-added', this._sourceAdded.bind(this));
@ -842,18 +825,8 @@ class NotificationSection extends MessageList.MessageListSection {
} }
_sourceAdded(tray, source) { _sourceAdded(tray, source) {
let obj = { source.connectObject('notification-added',
destroyId: 0, this._onNotificationAdded.bind(this), this);
notificationAddedId: 0,
};
obj.destroyId = source.connect('destroy', () => {
this._onSourceDestroy(source, obj);
});
obj.notificationAddedId = source.connect('notification-added',
this._onNotificationAdded.bind(this));
this._sources.set(source, obj);
} }
_onNotificationAdded(source, notification) { _onNotificationAdded(source, notification) {
@ -862,16 +835,15 @@ class NotificationSection extends MessageList.MessageListSection {
let isUrgent = notification.urgency == MessageTray.Urgency.CRITICAL; let isUrgent = notification.urgency == MessageTray.Urgency.CRITICAL;
let updatedId = notification.connect('updated', () => { notification.connectObject(
message.setSecondaryActor(new TimeLabel(notification.datetime)); 'destroy', () => {
this.moveMessage(message, isUrgent ? 0 : this._nUrgent, this.mapped);
});
let destroyId = notification.connect('destroy', () => {
notification.disconnect(destroyId);
notification.disconnect(updatedId);
if (isUrgent) if (isUrgent)
this._nUrgent--; this._nUrgent--;
}); },
'updated', () => {
message.setSecondaryActor(new TimeLabel(notification.datetime));
this.moveMessage(message, isUrgent ? 0 : this._nUrgent, this.mapped);
}, this);
if (isUrgent) { if (isUrgent) {
// Keep track of urgent notifications to keep them on top // Keep track of urgent notifications to keep them on top
@ -887,13 +859,6 @@ class NotificationSection extends MessageList.MessageListSection {
this.addMessageAtIndex(message, index, this.mapped); this.addMessageAtIndex(message, index, this.mapped);
} }
_onSourceDestroy(source, obj) {
source.disconnect(obj.destroyId);
source.disconnect(obj.notificationAddedId);
this._sources.delete(source);
}
vfunc_map() { vfunc_map() {
this._messages.forEach(message => { this._messages.forEach(message => {
if (message.notification.urgency != MessageTray.Urgency.CRITICAL) if (message.notification.urgency != MessageTray.Urgency.CRITICAL)
@ -1025,21 +990,14 @@ class CalendarMessageList extends St.Widget {
} }
_addSection(section) { _addSection(section) {
let connectionsIds = []; section.connectObject(
'notify::visible', this._sync.bind(this),
for (let prop of ['visible', 'empty', 'can-clear']) { 'notify::empty', this._sync.bind(this),
connectionsIds.push( 'notify::can-clear', this._sync.bind(this),
section.connect(`notify::${prop}`, this._sync.bind(this))); 'destroy', () => this._sectionList.remove_actor(section),
} 'message-focused', (_s, messageActor) => {
connectionsIds.push(section.connect('message-focused', (_s, messageActor) => {
Util.ensureActorVisibleInScrollView(this._scrollView, messageActor); Util.ensureActorVisibleInScrollView(this._scrollView, messageActor);
})); }, this);
connectionsIds.push(section.connect('destroy', () => {
connectionsIds.forEach(id => section.disconnect(id));
this._sectionList.remove_actor(section);
}));
this._sectionList.add_actor(section); this._sectionList.add_actor(section);
} }

19
js/ui/closeDialog.js
View File

@ -22,8 +22,6 @@ var CloseDialog = GObject.registerClass({
this._dialog = null; this._dialog = null;
this._tracked = undefined; this._tracked = undefined;
this._timeoutId = 0; this._timeoutId = 0;
this._windowFocusChangedId = 0;
this._keyFocusChangedId = 0;
} }
get window() { get window() {
@ -155,13 +153,11 @@ var CloseDialog = GObject.registerClass({
return GLib.SOURCE_CONTINUE; return GLib.SOURCE_CONTINUE;
}); });
this._windowFocusChangedId = global.display.connectObject(
global.display.connect('notify::focus-window', 'notify::focus-window', this._onFocusChanged.bind(this), this);
this._onFocusChanged.bind(this));
this._keyFocusChangedId = global.stage.connectObject(
global.stage.connect('notify::key-focus', 'notify::key-focus', this._onFocusChanged.bind(this), this);
this._onFocusChanged.bind(this));
this._addWindowEffect(); this._addWindowEffect();
this._initDialog(); this._initDialog();
@ -186,11 +182,8 @@ var CloseDialog = GObject.registerClass({
GLib.source_remove(this._timeoutId); GLib.source_remove(this._timeoutId);
this._timeoutId = 0; this._timeoutId = 0;
global.display.disconnect(this._windowFocusChangedId); global.display.disconnectObject(this);
this._windowFocusChangedId = 0; global.stage.disconnectObject(this);
global.stage.disconnect(this._keyFocusChangedId);
this._keyFocusChangedId = 0;
this._dialog._dialog.remove_all_transitions(); this._dialog._dialog.remove_all_transitions();

17
js/ui/components/automountManager.js
View File

@ -31,22 +31,19 @@ var AutomountManager = class {
} }
enable() { enable() {
this._volumeAddedId = this._volumeMonitor.connect('volume-added', this._onVolumeAdded.bind(this)); this._volumeMonitor.connectObject(
this._volumeRemovedId = this._volumeMonitor.connect('volume-removed', this._onVolumeRemoved.bind(this)); 'volume-added', this._onVolumeAdded.bind(this),
this._driveConnectedId = this._volumeMonitor.connect('drive-connected', this._onDriveConnected.bind(this)); 'volume-removed', this._onVolumeRemoved.bind(this),
this._driveDisconnectedId = this._volumeMonitor.connect('drive-disconnected', this._onDriveDisconnected.bind(this)); 'drive-connected', this._onDriveConnected.bind(this),
this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', this._onDriveEjectButton.bind(this)); 'drive-disconnected', this._onDriveDisconnected.bind(this),
'drive-eject-button', this._onDriveEjectButton.bind(this), this);
this._mountAllId = GLib.idle_add(GLib.PRIORITY_DEFAULT, this._startupMountAll.bind(this)); this._mountAllId = GLib.idle_add(GLib.PRIORITY_DEFAULT, this._startupMountAll.bind(this));
GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll'); GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll');
} }
disable() { disable() {
this._volumeMonitor.disconnect(this._volumeAddedId); this._volumeMonitor.disconnectObject(this);
this._volumeMonitor.disconnect(this._volumeRemovedId);
this._volumeMonitor.disconnect(this._driveConnectedId);
this._volumeMonitor.disconnect(this._driveDisconnectedId);
this._volumeMonitor.disconnect(this._driveEjectButtonId);
if (this._mountAllId > 0) { if (this._mountAllId > 0) {
GLib.source_remove(this._mountAllId); GLib.source_remove(this._mountAllId);

8
js/ui/components/autorunManager.js
View File

@ -151,13 +151,13 @@ var AutorunManager = class {
} }
enable() { enable() {
this._mountAddedId = this._volumeMonitor.connect('mount-added', this._onMountAdded.bind(this)); this._volumeMonitor.connectObject(
this._mountRemovedId = this._volumeMonitor.connect('mount-removed', this._onMountRemoved.bind(this)); 'mount-added', this._onMountAdded.bind(this),
'mount-removed', this._onMountRemoved.bind(this), this);
} }
disable() { disable() {
this._volumeMonitor.disconnect(this._mountAddedId); this._volumeMonitor.disconnectObject(this);
this._volumeMonitor.disconnect(this._mountRemovedId);
} }
_onMountAdded(monitor, mount) { _onMountAdded(monitor, mount) {

48
js/ui/components/polkitAgent.js
View File

@ -32,9 +32,9 @@ var AuthenticationDialog = GObject.registerClass({
this.message = description; this.message = description;
this.userNames = userNames; this.userNames = userNames;
this._sessionUpdatedId = Main.sessionMode.connect('updated', () => { Main.sessionMode.connectObject('updated', () => {
this.visible = !Main.sessionMode.isLocked; this.visible = !Main.sessionMode.isLocked;
}); }, this);
this.connect('closed', this._onDialogClosed.bind(this)); this.connect('closed', this._onDialogClosed.bind(this));
@ -164,10 +164,9 @@ var AuthenticationDialog = GObject.registerClass({
this._identityToAuth = Polkit.UnixUser.new_for_name(userName); this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
this._cookie = cookie; this._cookie = cookie;
this._userLoadedId = this._user.connect('notify::is-loaded', this._user.connectObject(
this._onUserChanged.bind(this)); 'notify::is-loaded', this._onUserChanged.bind(this),
this._userChangedId = this._user.connect('changed', 'changed', this._onUserChanged.bind(this), this);
this._onUserChanged.bind(this));
this._onUserChanged(); this._onUserChanged();
} }
@ -178,10 +177,11 @@ var AuthenticationDialog = GObject.registerClass({
identity: this._identityToAuth, identity: this._identityToAuth,
cookie: this._cookie, cookie: this._cookie,
}); });
this._sessionCompletedId = this._session.connect('completed', this._onSessionCompleted.bind(this)); this._session.connectObject(
this._sessionRequestId = this._session.connect('request', this._onSessionRequest.bind(this)); 'completed', this._onSessionCompleted.bind(this),
this._sessionShowErrorId = this._session.connect('show-error', this._onSessionShowError.bind(this)); 'request', this._onSessionRequest.bind(this),
this._sessionShowInfoId = this._session.connect('show-info', this._onSessionShowInfo.bind(this)); 'show-error', this._onSessionShowError.bind(this),
'show-info', this._onSessionShowInfo.bind(this), this);
this._session.initiate(); this._session.initiate();
} }
@ -314,18 +314,13 @@ var AuthenticationDialog = GObject.registerClass({
} }
_destroySession(delay = 0) { _destroySession(delay = 0) {
if (this._session) { this._session?.disconnectObject(this);
this._session.disconnect(this._sessionCompletedId);
this._session.disconnect(this._sessionRequestId);
this._session.disconnect(this._sessionShowErrorId);
this._session.disconnect(this._sessionShowInfoId);
if (!this._completed) if (!this._completed)
this._session.cancel(); this._session?.cancel();
this._completed = false; this._completed = false;
this._session = null; this._session = null;
}
if (this._sessionRequestTimeoutId) { if (this._sessionRequestTimeoutId) {
GLib.source_remove(this._sessionRequestTimeoutId); GLib.source_remove(this._sessionRequestTimeoutId);
@ -401,18 +396,14 @@ var AuthenticationDialog = GObject.registerClass({
} }
_onDialogClosed() { _onDialogClosed() {
if (this._sessionUpdatedId) Main.sessionMode.disconnectObject(this);
Main.sessionMode.disconnect(this._sessionUpdatedId);
if (this._sessionRequestTimeoutId) if (this._sessionRequestTimeoutId)
GLib.source_remove(this._sessionRequestTimeoutId); GLib.source_remove(this._sessionRequestTimeoutId);
this._sessionRequestTimeoutId = 0; this._sessionRequestTimeoutId = 0;
if (this._user) { this._user?.disconnectObject(this);
this._user.disconnect(this._userLoadedId);
this._user.disconnect(this._userChangedId);
this._user = null; this._user = null;
}
this._destroySession(); this._destroySession();
} }
@ -448,12 +439,11 @@ class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
_onInitiate(nativeAgent, actionId, message, iconName, cookie, userNames) { _onInitiate(nativeAgent, actionId, message, iconName, cookie, userNames) {
// Don't pop up a dialog while locked // Don't pop up a dialog while locked
if (Main.sessionMode.isLocked) { if (Main.sessionMode.isLocked) {
this._sessionUpdatedId = Main.sessionMode.connect('updated', () => { Main.sessionMode.connectObject('updated', () => {
Main.sessionMode.disconnect(this._sessionUpdatedId); Main.sessionMode.disconnectObject(this);
this._sessionUpdatedId = 0;
this._onInitiate(nativeAgent, actionId, message, iconName, cookie, userNames); this._onInitiate(nativeAgent, actionId, message, iconName, cookie, userNames);
}); }, this);
return; return;
} }
@ -473,9 +463,7 @@ class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
this._currentDialog.close(); this._currentDialog.close();
this._currentDialog = null; this._currentDialog = null;
if (this._sessionUpdatedId) Main.sessionMode.disconnectObject(this);
Main.sessionMode.disconnect(this._sessionUpdatedId);
this._sessionUpdatedId = 0;
this.complete(dismissed); this.complete(dismissed);
} }

68
js/ui/components/telepathyClient.js
View File

@ -316,19 +316,21 @@ class ChatSource extends MessageTray.Source {
this._conn = conn; this._conn = conn;
this._channel = channel; this._channel = channel;
this._closedId = this._channel.connect('invalidated', this._channelClosed.bind(this));
this._notifyTimeoutId = 0; this._notifyTimeoutId = 0;
this._presence = contact.get_presence_type(); this._presence = contact.get_presence_type();
this._sentId = this._channel.connect('message-sent', this._messageSent.bind(this)); this._channel.connectObject(
this._receivedId = this._channel.connect('message-received', this._messageReceived.bind(this)); 'invalidated', this._channelClosed.bind(this),
this._pendingId = this._channel.connect('pending-message-removed', this._pendingRemoved.bind(this)); 'message-sent', this._messageSent.bind(this),
'message-received', this._messageReceived.bind(this),
'pending-message-removed', this._pendingRemoved.bind(this), this);
this._notifyAliasId = this._contact.connect('notify::alias', this._updateAlias.bind(this)); this._contact.connectObject(
this._notifyAvatarId = this._contact.connect('notify::avatar-file', this._updateAvatarIcon.bind(this)); 'notify::alias', this._updateAlias.bind(this),
this._presenceChangedId = this._contact.connect('presence-changed', this._presenceChanged.bind(this)); 'notify::avatar-file', this._updateAvatarIcon.bind(this),
'presence-changed', this._presenceChanged.bind(this), this);
// Add ourselves as a source. // Add ourselves as a source.
Main.messageTray.add(this); Main.messageTray.add(this);
@ -341,14 +343,13 @@ class ChatSource extends MessageTray.Source {
return; return;
this._notification = new ChatNotification(this); this._notification = new ChatNotification(this);
this._notification.connect('activated', this.open.bind(this)); this._notification.connectObject(
this._notification.connect('updated', () => { 'activated', this.open.bind(this),
'destroy', () => (this._notification = null),
'updated', () => {
if (this._banner && this._banner.expanded) if (this._banner && this._banner.expanded)
this._ackMessages(); this._ackMessages();
}); }, this);
this._notification.connect('destroy', () => {
this._notification = null;
});
this.pushNotification(this._notification); this.pushNotification(this._notification);
} }
@ -362,11 +363,9 @@ class ChatSource extends MessageTray.Source {
this._banner = new ChatNotificationBanner(this._notification); this._banner = new ChatNotificationBanner(this._notification);
// We ack messages when the user expands the new notification // We ack messages when the user expands the new notification
let id = this._banner.connect('expanded', this._ackMessages.bind(this)); this._banner.connectObject(
this._banner.connect('destroy', () => { 'expanded', this._ackMessages.bind(this),
this._banner.disconnect(id); 'destroy', () => (this._banner = null), this);
this._banner = null;
});
return this._banner; return this._banner;
} }
@ -535,14 +534,8 @@ class ChatSource extends MessageTray.Source {
return; return;
this._destroyed = true; this._destroyed = true;
this._channel.disconnect(this._closedId); this._channel.disconnectObject(this);
this._channel.disconnect(this._receivedId); this._contact.disconnectObject(this);
this._channel.disconnect(this._pendingId);
this._channel.disconnect(this._sentId);
this._contact.disconnect(this._notifyAliasId);
this._contact.disconnect(this._notifyAvatarId);
this._contact.disconnect(this._presenceChangedId);
super.destroy(reason); super.destroy(reason);
} }
@ -907,32 +900,19 @@ class ChatNotificationBanner extends MessageTray.NotificationBanner {
this._messageActors = new Map(); this._messageActors = new Map();
this._messageAddedId = this.notification.connect('message-added', this.notification.connectObject(
(n, message) => { 'timestamp-changed', (n, message) => this._updateTimestamp(message),
this._addMessage(message); 'message-added', (n, message) => this._addMessage(message),
}); 'message-removed', (n, message) => {
this._messageRemovedId = this.notification.connect('message-removed',
(n, message) => {
let actor = this._messageActors.get(message); let actor = this._messageActors.get(message);
if (this._messageActors.delete(message)) if (this._messageActors.delete(message))
actor.destroy(); actor.destroy();
}); }, this);
this._timestampChangedId = this.notification.connect('timestamp-changed',
(n, message) => {
this._updateTimestamp(message);
});
for (let i = this.notification.messages.length - 1; i >= 0; i--) for (let i = this.notification.messages.length - 1; i >= 0; i--)
this._addMessage(this.notification.messages[i]); this._addMessage(this.notification.messages[i]);
} }
_onDestroy() {
super._onDestroy();
this.notification.disconnect(this._messageAddedId);
this.notification.disconnect(this._messageRemovedId);
this.notification.disconnect(this._timestampChangedId);
}
scrollTo(side) { scrollTo(side) {
let adjustment = this._scrollArea.vscroll.adjustment; let adjustment = this._scrollArea.vscroll.adjustment;
if (side == St.Side.TOP) if (side == St.Side.TOP)

7
js/ui/dash.js
View File

@ -487,13 +487,10 @@ var Dash = GObject.registerClass({
item.hideLabel(); item.hideLabel();
}); });
let id = Main.overview.connect('hiding', () => { Main.overview.connectObject('hiding', () => {
this._labelShowing = false; this._labelShowing = false;
item.hideLabel(); item.hideLabel();
}); }, item.child);
item.child.connect('destroy', () => {
Main.overview.disconnect(id);
});
if (appIcon) { if (appIcon) {
appIcon.connect('sync-tooltip', () => { appIcon.connect('sync-tooltip', () => {

14
js/ui/dialog.js
View File

@ -20,7 +20,6 @@ class Dialog extends St.Widget {
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
this._initialKeyFocus = null; this._initialKeyFocus = null;
this._initialKeyFocusDestroyId = 0;
this._pressedKey = null; this._pressedKey = null;
this._buttonKeys = {}; this._buttonKeys = {};
this._createDialog(); this._createDialog();
@ -61,9 +60,7 @@ class Dialog extends St.Widget {
} }
makeInactive() { makeInactive() {
if (this._eventId != 0) this._parentActor.disconnectObject(this);
this._parentActor.disconnect(this._eventId);
this._eventId = 0;
this.buttonLayout.get_children().forEach(c => c.set_reactive(false)); this.buttonLayout.get_children().forEach(c => c.set_reactive(false));
} }
@ -99,15 +96,12 @@ class Dialog extends St.Widget {
} }
_setInitialKeyFocus(actor) { _setInitialKeyFocus(actor) {
if (this._initialKeyFocus) this._initialKeyFocus?.disconnectObject(this);
this._initialKeyFocus.disconnect(this._initialKeyFocusDestroyId);
this._initialKeyFocus = actor; this._initialKeyFocus = actor;
this._initialKeyFocusDestroyId = actor.connect('destroy', () => { actor.connectObject('destroy',
this._initialKeyFocus = null; () => (this._initialKeyFocus = null), this);
this._initialKeyFocusDestroyId = 0;
});
} }
get initialKeyFocus() { get initialKeyFocus() {

12
js/ui/endSessionDialog.js
View File

@ -269,13 +269,12 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._rebootButton = null; this._rebootButton = null;
this._rebootButtonAlt = null; this._rebootButtonAlt = null;
this.connect('destroy',
this._onDestroy.bind(this));
this.connect('opened', this.connect('opened',
this._onOpened.bind(this)); this._onOpened.bind(this));
this._userLoadedId = this._user.connect('notify::is-loaded', this._sync.bind(this)); this._user.connectObject(
this._userChangedId = this._user.connect('changed', this._sync.bind(this)); 'notify::is-loaded', this._sync.bind(this),
'changed', this._sync.bind(this), this);
this._messageDialogContent = new Dialog.MessageDialogContent(); this._messageDialogContent = new Dialog.MessageDialogContent();
@ -330,11 +329,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
} }
} }
_onDestroy() {
this._user.disconnect(this._userLoadedId);
this._user.disconnect(this._userChangedId);
}
_isDischargingBattery() { _isDischargingBattery() {
return this._powerProxy.IsPresent && return this._powerProxy.IsPresent &&
this._powerProxy.State !== UPower.DeviceState.CHARGING && this._powerProxy.State !== UPower.DeviceState.CHARGING &&

18
js/ui/iconGrid.js
View File

@ -67,8 +67,6 @@ class BaseIcon extends Shell.SquareBin {
super._init({ style_class: styleClass }); super._init({ style_class: styleClass });
this.connect('destroy', this._onDestroy.bind(this));
this._box = new St.BoxLayout({ this._box = new St.BoxLayout({
vertical: true, vertical: true,
x_expand: true, x_expand: true,
@ -99,7 +97,8 @@ class BaseIcon extends Shell.SquareBin {
this.icon = null; this.icon = null;
let cache = St.TextureCache.get_default(); let cache = St.TextureCache.get_default();
this._iconThemeChangedId = cache.connect('icon-theme-changed', this._onIconThemeChanged.bind(this)); cache.connectObject(
'icon-theme-changed', this._onIconThemeChanged.bind(this), this);
} }
// This can be overridden by a subclass, or by the createIcon // This can be overridden by a subclass, or by the createIcon
@ -148,14 +147,6 @@ class BaseIcon extends Shell.SquareBin {
this._createIconTexture(size); this._createIconTexture(size);
} }
_onDestroy() {
if (this._iconThemeChangedId > 0) {
let cache = St.TextureCache.get_default();
cache.disconnect(this._iconThemeChangedId);
this._iconThemeChangedId = 0;
}
}
_onIconThemeChanged() { _onIconThemeChanged() {
this._createIconTexture(this.iconSize); this._createIconTexture(this.iconSize);
} }
@ -690,13 +681,12 @@ var IconGridLayout = GObject.registerClass({
} }
vfunc_set_container(container) { vfunc_set_container(container) {
if (this._container) this._container?.disconnectObject(this);
this._container.disconnect(this._containerDestroyedId);
this._container = container; this._container = container;
if (this._container) if (this._container)
this._containerDestroyedId = this._container.connect('destroy', this._onDestroy.bind(this)); this._container.connectObject('destroy', this._onDestroy.bind(this), this);
} }
vfunc_get_preferred_width(_container, _forHeight) { vfunc_get_preferred_width(_container, _forHeight) {

181
js/ui/keyboard.js
View File

@ -250,12 +250,10 @@ var LanguageSelectionPopup = class extends PopupMenu.PopupMenu {
item = this.addSettingsAction(_("Region & Language Settings"), 'gnome-region-panel.desktop'); item = this.addSettingsAction(_("Region & Language Settings"), 'gnome-region-panel.desktop');
item.can_focus = false; item.can_focus = false;
this._capturedEventId = 0; actor.connectObject('notify::mapped', () => {
this._unmapId = actor.connect('notify::mapped', () => {
if (!actor.is_mapped()) if (!actor.is_mapped())
this.close(true); this.close(true);
}); }, this);
} }
_onCapturedEvent(actor, event) { _onCapturedEvent(actor, event) {
@ -273,23 +271,18 @@ var LanguageSelectionPopup = class extends PopupMenu.PopupMenu {
open(animate) { open(animate) {
super.open(animate); super.open(animate);
this._capturedEventId = global.stage.connect('captured-event', global.stage.connectObject(
this._onCapturedEvent.bind(this)); 'captured-event', this._onCapturedEvent.bind(this), this);
} }
close(animate) { close(animate) {
super.close(animate); super.close(animate);
if (this._capturedEventId != 0) { global.stage.disconnectObject(this);
global.stage.disconnect(this._capturedEventId);
this._capturedEventId = 0;
}
} }
destroy() { destroy() {
if (this._capturedEventId != 0) global.stage.disconnectObject(this);
global.stage.disconnect(this._capturedEventId); this.sourceActor.disconnectObject(this);
if (this._unmapId != 0)
this.sourceActor.disconnect(this._unmapId);
super.destroy(); super.destroy();
} }
}; };
@ -318,9 +311,6 @@ var Key = GObject.registerClass({
this._extendedKeyboard = null; this._extendedKeyboard = null;
this._pressTimeoutId = 0; this._pressTimeoutId = 0;
this._capturedPress = false; this._capturedPress = false;
this._capturedEventId = 0;
this._unmapId = 0;
} }
_onDestroy() { _onDestroy() {
@ -425,25 +415,19 @@ var Key = GObject.registerClass({
_showSubkeys() { _showSubkeys() {
this._boxPointer.open(BoxPointer.PopupAnimation.FULL); this._boxPointer.open(BoxPointer.PopupAnimation.FULL);
this._capturedEventId = global.stage.connect('captured-event', global.stage.connectObject(
this._onCapturedEvent.bind(this)); 'captured-event', this._onCapturedEvent.bind(this), this);
this._unmapId = this.keyButton.connect('notify::mapped', () => { this.keyButton.connectObject('notify::mapped', () => {
if (!this.keyButton.is_mapped()) if (!this.keyButton.is_mapped())
this._hideSubkeys(); this._hideSubkeys();
}); }, this);
} }
_hideSubkeys() { _hideSubkeys() {
if (this._boxPointer) if (this._boxPointer)
this._boxPointer.close(BoxPointer.PopupAnimation.FULL); this._boxPointer.close(BoxPointer.PopupAnimation.FULL);
if (this._capturedEventId) { global.stage.disconnectObject(this);
global.stage.disconnect(this._capturedEventId); this.keyButton.disconnectObject(this);
this._capturedEventId = 0;
}
if (this._unmapId) {
this.keyButton.disconnect(this._unmapId);
this._unmapId = 0;
}
this._capturedPress = false; this._capturedPress = false;
} }
@ -581,28 +565,26 @@ var FocusTracker = class {
constructor() { constructor() {
this._rect = null; this._rect = null;
this._notifyFocusId = global.display.connect('notify::focus-window', () => { global.display.connectObject(
'notify::focus-window', () => {
this._setCurrentWindow(global.display.focus_window); this._setCurrentWindow(global.display.focus_window);
this.emit('window-changed', this._currentWindow); this.emit('window-changed', this._currentWindow);
}); },
'grab-op-begin', (display, window, op) => {
if (window === this._currentWindow &&
(op === Meta.GrabOp.MOVING || op === Meta.GrabOp.KEYBOARD_MOVING))
this.emit('window-grabbed');
}, this);
this._setCurrentWindow(global.display.focus_window); this._setCurrentWindow(global.display.focus_window);
this._grabOpBeginId = global.display.connect('grab-op-begin', (display, window, op) => {
if (window == this._currentWindow &&
(op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING))
this.emit('window-grabbed');
});
/* Valid for wayland clients */ /* Valid for wayland clients */
this._cursorLocationChangedId = Main.inputMethod.connectObject('cursor-location-changed',
Main.inputMethod.connect('cursor-location-changed', (o, rect) => { (o, rect) => this._setCurrentRect(rect), this);
this._setCurrentRect(rect);
});
this._ibusManager = IBusManager.getIBusManager(); this._ibusManager = IBusManager.getIBusManager();
this._setCursorLocationId = this._ibusManager.connectObject(
this._ibusManager.connect('set-cursor-location', (manager, rect) => { 'set-cursor-location', (manager, rect) => {
/* Valid for X11 clients only */ /* Valid for X11 clients only */
if (Main.inputMethod.currentFocus) if (Main.inputMethod.currentFocus)
return; return;
@ -611,27 +593,17 @@ var FocusTracker = class {
grapheneRect.init(rect.x, rect.y, rect.width, rect.height); grapheneRect.init(rect.x, rect.y, rect.width, rect.height);
this._setCurrentRect(grapheneRect); this._setCurrentRect(grapheneRect);
}); },
this._focusInId = this._ibusManager.connect('focus-in', () => { 'focus-in', () => this.emit('focus-changed', true),
this.emit('focus-changed', true); 'focus-out', () => this.emit('focus-changed', false),
}); this);
this._focusOutId = this._ibusManager.connect('focus-out', () => {
this.emit('focus-changed', false);
});
} }
destroy() { destroy() {
if (this._currentWindow) { this._currentWindow?.disconnectObject(this);
this._currentWindow.disconnect(this._currentWindowPositionChangedId); global.display.disconnectObject(this);
delete this._currentWindowPositionChangedId; Main.inputMethod.disconnectObject(this);
} this._ibusManager.disconnectObject(this);
global.display.disconnect(this._notifyFocusId);
global.display.disconnect(this._grabOpBeginId);
Main.inputMethod.disconnect(this._cursorLocationChangedId);
this._ibusManager.disconnect(this._setCursorLocationId);
this._ibusManager.disconnect(this._focusInId);
this._ibusManager.disconnect(this._focusOutId);
} }
get currentWindow() { get currentWindow() {
@ -639,17 +611,13 @@ var FocusTracker = class {
} }
_setCurrentWindow(window) { _setCurrentWindow(window) {
if (this._currentWindow) { this._currentWindow?.disconnectObject(this);
this._currentWindow.disconnect(this._currentWindowPositionChangedId);
delete this._currentWindowPositionChangedId;
}
this._currentWindow = window; this._currentWindow = window;
if (this._currentWindow) { if (this._currentWindow) {
this._currentWindowPositionChangedId = this._currentWindow.connectObject(
this._currentWindow.connect('position-changed', () => 'position-changed', () => this.emit('window-moved'), this);
this.emit('window-moved'));
} }
} }
@ -1325,22 +1293,21 @@ var Keyboard = GObject.registerClass({
this._emojiKeyVisible = Meta.is_wayland_compositor(); this._emojiKeyVisible = Meta.is_wayland_compositor();
this._focusTracker = new FocusTracker(); this._focusTracker = new FocusTracker();
this._connectSignal(this._focusTracker, 'position-changed', this._focusTracker.connectObject(
this._onFocusPositionChanged.bind(this)); 'position-changed', this._onFocusPositionChanged.bind(this),
this._connectSignal(this._focusTracker, 'window-grabbed', 'window-grabbed', this._onFocusWindowMoving.bind(this), this);
this._onFocusWindowMoving.bind(this));
this._windowMovedId = this._focusTracker.connect('window-moved', this._windowMovedId = this._focusTracker.connect('window-moved',
this._onFocusWindowMoving.bind(this)); this._onFocusWindowMoving.bind(this));
// Valid only for X11 // Valid only for X11
if (!Meta.is_wayland_compositor()) { if (!Meta.is_wayland_compositor()) {
this._connectSignal(this._focusTracker, 'focus-changed', (_tracker, focused) => { this._focusTracker.connectObject('focus-changed', (_tracker, focused) => {
if (focused) if (focused)
this.open(Main.layoutManager.focusIndex); this.open(Main.layoutManager.focusIndex);
else else
this.close(); this.close();
}); }, this);
} }
this._showIdleId = 0; this._showIdleId = 0;
@ -1349,22 +1316,14 @@ var Keyboard = GObject.registerClass({
this._keyboardRequested = false; this._keyboardRequested = false;
this._keyboardRestingId = 0; this._keyboardRestingId = 0;
this._connectSignal(Main.layoutManager, 'monitors-changed', this._relayout.bind(this)); Main.layoutManager.connectObject('monitors-changed',
this._relayout.bind(this), this);
this._setupKeyboard(); this._setupKeyboard();
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }
_connectSignal(obj, signal, callback) {
if (!this._connectionsIDs)
this._connectionsIDs = [];
let id = obj.connect(signal, callback);
this._connectionsIDs.push([obj, id]);
return id;
}
get visible() { get visible() {
return this._keyboardVisible && super.visible; return this._keyboardVisible && super.visible;
} }
@ -1389,10 +1348,6 @@ var Keyboard = GObject.registerClass({
delete this._focusTracker; delete this._focusTracker;
} }
for (let [obj, id] of this._connectionsIDs)
obj.disconnect(id);
delete this._connectionsIDs;
this._clearShowIdle(); this._clearShowIdle();
this._keyboardController.destroy(); this._keyboardController.destroy();
@ -1436,10 +1391,10 @@ var Keyboard = GObject.registerClass({
this._emojiSelection.hide(); this._emojiSelection.hide();
this._keypad = new Keypad(); this._keypad = new Keypad();
this._connectSignal(this._keypad, 'keyval', (_keypad, keyval) => { this._keypad.connectObject('keyval', (_keypad, keyval) => {
this._keyboardController.keyvalPress(keyval); this._keyboardController.keyvalPress(keyval);
this._keyboardController.keyvalRelease(keyval); this._keyboardController.keyvalRelease(keyval);
}); }, this);
this._aspectContainer.add_child(this._keypad); this._aspectContainer.add_child(this._keypad);
this._keypad.hide(); this._keypad.hide();
this._keypadVisible = false; this._keypadVisible = false;
@ -1452,20 +1407,18 @@ var Keyboard = GObject.registerClass({
// keyboard on RTL locales. // keyboard on RTL locales.
this.text_direction = Clutter.TextDirection.LTR; this.text_direction = Clutter.TextDirection.LTR;
this._connectSignal(this._keyboardController, 'active-group', this._keyboardController.connectObject(
this._onGroupChanged.bind(this)); 'active-group', this._onGroupChanged.bind(this),
this._connectSignal(this._keyboardController, 'groups-changed', 'groups-changed', this._onKeyboardGroupsChanged.bind(this),
this._onKeyboardGroupsChanged.bind(this)); 'panel-state', this._onKeyboardStateChanged.bind(this),
this._connectSignal(this._keyboardController, 'panel-state', 'keypad-visible', this._onKeypadVisible.bind(this),
this._onKeyboardStateChanged.bind(this)); this);
this._connectSignal(this._keyboardController, 'keypad-visible', global.stage.connectObject('notify::key-focus',
this._onKeypadVisible.bind(this)); this._onKeyFocusChanged.bind(this), this);
this._connectSignal(global.stage, 'notify::key-focus',
this._onKeyFocusChanged.bind(this));
if (Meta.is_wayland_compositor()) { if (Meta.is_wayland_compositor()) {
this._connectSignal(this._keyboardController, 'emoji-visible', this._keyboardController.connectObject('emoji-visible',
this._onEmojiKeyVisible.bind(this)); this._onEmojiKeyVisible.bind(this), this);
} }
this._relayout(); this._relayout();
@ -2079,26 +2032,20 @@ var KeyboardController = class {
this._virtualDevice = seat.create_virtual_device(Clutter.InputDeviceType.KEYBOARD_DEVICE); this._virtualDevice = seat.create_virtual_device(Clutter.InputDeviceType.KEYBOARD_DEVICE);
this._inputSourceManager = InputSourceManager.getInputSourceManager(); this._inputSourceManager = InputSourceManager.getInputSourceManager();
this._sourceChangedId = this._inputSourceManager.connect('current-source-changed', this._inputSourceManager.connectObject(
this._onSourceChanged.bind(this)); 'current-source-changed', this._onSourceChanged.bind(this),
this._sourcesModifiedId = this._inputSourceManager.connect('sources-changed', 'sources-changed', this._onSourcesModified.bind(this), this);
this._onSourcesModified.bind(this));
this._currentSource = this._inputSourceManager.currentSource; this._currentSource = this._inputSourceManager.currentSource;
this._notifyContentPurposeId = Main.inputMethod.connect( Main.inputMethod.connectObject(
'notify::content-purpose', this._onContentPurposeHintsChanged.bind(this)); 'notify::content-purpose', this._onContentPurposeHintsChanged.bind(this),
this._notifyContentHintsId = Main.inputMethod.connect( 'notify::content-hints', this._onContentPurposeHintsChanged.bind(this),
'notify::content-hints', this._onContentPurposeHintsChanged.bind(this)); 'input-panel-state', (o, state) => this.emit('panel-state', state), this);
this._notifyInputPanelStateId = Main.inputMethod.connect(
'input-panel-state', (o, state) => this.emit('panel-state', state));
} }
destroy() { destroy() {
this._inputSourceManager.disconnect(this._sourceChangedId); this._inputSourceManager.disconnectObject(this);
this._inputSourceManager.disconnect(this._sourcesModifiedId); Main.inputMethod.disconnectObject(this);
Main.inputMethod.disconnect(this._notifyContentPurposeId);
Main.inputMethod.disconnect(this._notifyContentHintsId);
Main.inputMethod.disconnect(this._notifyInputPanelStateId);
// Make sure any buttons pressed by the virtual device are released // Make sure any buttons pressed by the virtual device are released
// immediately instead of waiting for the next GC cycle // immediately instead of waiting for the next GC cycle

15
js/ui/layout.js
View File

@ -891,12 +891,10 @@ var LayoutManager = GObject.registerClass({
let actorData = Params.parse(params, defaultParams); let actorData = Params.parse(params, defaultParams);
actorData.actor = actor; actorData.actor = actor;
actorData.visibleId = actor.connect('notify::visible', actor.connectObject(
this._queueUpdateRegions.bind(this)); 'notify::visible', this._queueUpdateRegions.bind(this),
actorData.allocationId = actor.connect('notify::allocation', 'notify::allocation', this._queueUpdateRegions.bind(this),
this._queueUpdateRegions.bind(this)); 'destroy', this._untrackActor.bind(this), this);
actorData.destroyId = actor.connect('destroy',
this._untrackActor.bind(this));
// Note that destroying actor will unset its parent, so we don't // Note that destroying actor will unset its parent, so we don't
// need to connect to 'destroy' too. // need to connect to 'destroy' too.
@ -910,12 +908,9 @@ var LayoutManager = GObject.registerClass({
if (i == -1) if (i == -1)
return; return;
let actorData = this._trackedActors[i];
this._trackedActors.splice(i, 1); this._trackedActors.splice(i, 1);
actor.disconnect(actorData.visibleId); actor.disconnectObject(this);
actor.disconnect(actorData.allocationId);
actor.disconnect(actorData.destroyId);
this._queueUpdateRegions(); this._queueUpdateRegions();
} }

14
js/ui/lightbox.js
View File

@ -152,8 +152,9 @@ var Lightbox = GObject.registerClass({
})); }));
} }
this._actorAddedSignalId = container.connect('actor-added', this._actorAdded.bind(this)); container.connectObject(
this._actorRemovedSignalId = container.connect('actor-removed', this._actorRemoved.bind(this)); 'actor-added', this._actorAdded.bind(this),
'actor-removed', this._actorRemoved.bind(this), this);
this._highlighted = null; this._highlighted = null;
} }
@ -283,15 +284,6 @@ var Lightbox = GObject.registerClass({
* by destroying its container or by explicitly calling this.destroy(). * by destroying its container or by explicitly calling this.destroy().
*/ */
_onDestroy() { _onDestroy() {
if (this._actorAddedSignalId) {
this._container.disconnect(this._actorAddedSignalId);
this._actorAddedSignalId = 0;
}
if (this._actorRemovedSignalId) {
this._container.disconnect(this._actorRemovedSignalId);
this._actorRemovedSignalId = 0;
}
this.highlight(null); this.highlight(null);
} }
}); });

7
js/ui/magnifier.js
View File

@ -158,13 +158,12 @@ var Magnifier = class Magnifier {
if (activate) { if (activate) {
this._updateMouseSprite(); this._updateMouseSprite();
this._cursorSpriteChangedId = this._cursorTracker.connectObject(
this._cursorTracker.connect('cursor-changed', 'cursor-changed', this._updateMouseSprite.bind(this), this);
this._updateMouseSprite.bind(this));
Meta.disable_unredirect_for_display(global.display); Meta.disable_unredirect_for_display(global.display);
this.startTrackingMouse(); this.startTrackingMouse();
} else { } else {
this._cursorTracker.disconnect(this._cursorSpriteChangedId); this._cursorTracker.disconnectObject(this);
this._mouseSprite.content.texture = null; this._mouseSprite.content.texture = null;
Meta.enable_unredirect_for_display(global.display); Meta.enable_unredirect_for_display(global.display);
this.stopTrackingMouse(); this.stopTrackingMouse();

22
js/ui/messageList.js
View File

@ -171,21 +171,14 @@ class ScaleLayout extends Clutter.BinLayout {
if (this._container == container) if (this._container == container)
return; return;
if (this._container) { this._container?.disconnectObject(this);
for (let id of this._signals)
this._container.disconnect(id);
}
this._container = container; this._container = container;
this._signals = [];
if (this._container) { if (this._container) {
for (let signal of ['notify::scale-x', 'notify::scale-y']) { this._container.connectObject(
let id = this._container.connect(signal, () => { 'notify::scale-x', () => this.layout_changed(),
this.layout_changed(); 'notify::scale-y', () => this.layout_changed(), this);
});
this._signals.push(id);
}
} }
} }
@ -586,11 +579,8 @@ var MessageListSection = GObject.registerClass({
this._list.connect('actor-added', this._sync.bind(this)); this._list.connect('actor-added', this._sync.bind(this));
this._list.connect('actor-removed', this._sync.bind(this)); this._list.connect('actor-removed', this._sync.bind(this));
let id = Main.sessionMode.connect('updated', Main.sessionMode.connectObject(
this._sync.bind(this)); 'updated', () => this._sync(), this);
this.connect('destroy', () => {
Main.sessionMode.disconnect(id);
});
this._empty = true; this._empty = true;
this._canClear = false; this._canClear = false;

89
js/ui/messageTray.js
View File

@ -76,7 +76,6 @@ var FocusGrabber = class FocusGrabber {
constructor(actor) { constructor(actor) {
this._actor = actor; this._actor = actor;
this._prevKeyFocusActor = null; this._prevKeyFocusActor = null;
this._focusActorChangedId = 0;
this._focused = false; this._focused = false;
} }
@ -86,7 +85,8 @@ var FocusGrabber = class FocusGrabber {
this._prevKeyFocusActor = global.stage.get_key_focus(); this._prevKeyFocusActor = global.stage.get_key_focus();
this._focusActorChangedId = global.stage.connect('notify::key-focus', this._focusActorChanged.bind(this)); global.stage.connectObject('notify::key-focus',
this._focusActorChanged.bind(this), this);
if (!this._actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false)) if (!this._actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false))
this._actor.grab_key_focus(); this._actor.grab_key_focus();
@ -98,10 +98,7 @@ var FocusGrabber = class FocusGrabber {
if (!this._focused) if (!this._focused)
return false; return false;
if (this._focusActorChangedId > 0) { global.stage.disconnectObject(this);
global.stage.disconnect(this._focusActorChangedId);
this._focusActorChangedId = 0;
}
this._focused = false; this._focused = false;
return true; return true;
@ -445,15 +442,6 @@ var Notification = GObject.registerClass({
setResident(resident) { setResident(resident) {
this.resident = resident; this.resident = resident;
if (this.resident) {
if (this._activatedId) {
this.disconnect(this._activatedId);
this._activatedId = 0;
}
} else if (!this._activatedId) {
this._activatedId = this.connect_after('activated', () => this.destroy());
}
} }
setTransient(isTransient) { setTransient(isTransient) {
@ -495,14 +483,12 @@ var Notification = GObject.registerClass({
activate() { activate() {
this.emit('activated'); this.emit('activated');
if (!this.resident)
this.destroy();
} }
destroy(reason = NotificationDestroyedReason.DISMISSED) { destroy(reason = NotificationDestroyedReason.DISMISSED) {
if (this._activatedId) {
this.disconnect(this._activatedId);
delete this._activatedId;
}
this.emit('destroy', reason); this.emit('destroy', reason);
this.run_dispose(); this.run_dispose();
} }
@ -525,21 +511,13 @@ var NotificationBanner = GObject.registerClass({
this._addActions(); this._addActions();
this._addSecondaryIcon(); this._addSecondaryIcon();
this._activatedId = this.notification.connect('activated', () => { this.notification.connectObject('activated', () => {
// We hide all types of notifications once the user clicks on // We hide all types of notifications once the user clicks on
// them because the common outcome of clicking should be the // them because the common outcome of clicking should be the
// relevant window being brought forward and the user's // relevant window being brought forward and the user's
// attention switching to the window. // attention switching to the window.
this.emit('done-displaying'); this.emit('done-displaying');
}); }, this);
}
_disconnectNotificationSignals() {
super._disconnectNotificationSignals();
if (this._activatedId)
this.notification.disconnect(this._activatedId);
this._activatedId = 0;
} }
_onUpdated(n, clear) { _onUpdated(n, clear) {
@ -621,10 +599,8 @@ class SourceActor extends St.Widget {
this._source = source; this._source = source;
this._size = size; this._size = size;
this.connect('destroy', () => { this.connect('destroy',
this._source.disconnect(this._iconUpdatedId); () => (this._actorDestroyed = true));
this._actorDestroyed = true;
});
this._actorDestroyed = false; this._actorDestroyed = false;
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor; let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
@ -636,7 +612,8 @@ class SourceActor extends St.Widget {
this.add_actor(this._iconBin); this.add_actor(this._iconBin);
this._iconUpdatedId = this._source.connect('icon-updated', this._updateIcon.bind(this)); this._source.connectObject('icon-updated',
this._updateIcon.bind(this), this);
this._updateIcon(); this._updateIcon();
} }
@ -868,7 +845,6 @@ var MessageTray = GObject.registerClass({
this._notificationQueue = []; this._notificationQueue = [];
this._notification = null; this._notification = null;
this._banner = null; this._banner = null;
this._bannerClickedId = 0;
this._userActiveWhileNotificationShown = false; this._userActiveWhileNotificationShown = false;
@ -924,7 +900,7 @@ var MessageTray = GObject.registerClass({
Shell.ActionMode.OVERVIEW, Shell.ActionMode.OVERVIEW,
this._expandActiveNotification.bind(this)); this._expandActiveNotification.bind(this));
this._sources = new Map(); this._sources = new Set();
this._sessionUpdated(); this._sessionUpdated();
} }
@ -995,26 +971,18 @@ var MessageTray = GObject.registerClass({
} }
_addSource(source) { _addSource(source) {
let obj = { this._sources.add(source);
showId: 0,
destroyId: 0,
};
this._sources.set(source, obj); source.connectObject(
'notification-show', this._onNotificationShow.bind(this),
obj.showId = source.connect('notification-show', this._onNotificationShow.bind(this)); 'destroy', () => this._removeSource(source), this);
obj.destroyId = source.connect('destroy', this._onSourceDestroy.bind(this));
this.emit('source-added', source); this.emit('source-added', source);
} }
_removeSource(source) { _removeSource(source) {
let obj = this._sources.get(source);
this._sources.delete(source); this._sources.delete(source);
source.disconnectObject(this);
source.disconnect(obj.showId);
source.disconnect(obj.destroyId);
this.emit('source-removed', source); this.emit('source-removed', source);
} }
@ -1034,10 +1002,6 @@ var MessageTray = GObject.registerClass({
} }
} }
_onSourceDestroy(source) {
this._removeSource(source);
}
_onNotificationDestroy(notification) { _onNotificationDestroy(notification) {
this._notificationRemoved = this._notification === notification; this._notificationRemoved = this._notification === notification;
@ -1264,11 +1228,9 @@ var MessageTray = GObject.registerClass({
} }
this._banner = this._notification.createBanner(); this._banner = this._notification.createBanner();
this._bannerClickedId = this._banner.connect('done-displaying', this._banner.connectObject(
this._escapeTray.bind(this)); 'done-displaying', this._escapeTray.bind(this),
this._bannerUnfocusedId = this._banner.connect('unfocused', () => { 'unfocused', () => this._updateState(), this);
this._updateState();
});
this._bannerBin.add_actor(this._banner); this._bannerBin.add_actor(this._banner);
@ -1381,14 +1343,7 @@ var MessageTray = GObject.registerClass({
_hideNotification(animate) { _hideNotification(animate) {
this._notificationFocusGrabber.ungrabFocus(); this._notificationFocusGrabber.ungrabFocus();
if (this._bannerClickedId) { this._banner.disconnectObject(this);
this._banner.disconnect(this._bannerClickedId);
this._bannerClickedId = 0;
}
if (this._bannerUnfocusedId) {
this._banner.disconnect(this._bannerUnfocusedId);
this._bannerUnfocusedId = 0;
}
this._resetNotificationLeftTimeout(); this._resetNotificationLeftTimeout();
this._bannerBin.remove_all_transitions(); this._bannerBin.remove_all_transitions();

9
js/ui/modalDialog.js
View File

@ -154,15 +154,12 @@ var ModalDialog = GObject.registerClass({
} }
setInitialKeyFocus(actor) { setInitialKeyFocus(actor) {
if (this._initialKeyFocusDestroyId) this._initialKeyFocus?.disconnectObject(this);
this._initialKeyFocus.disconnect(this._initialKeyFocusDestroyId);
this._initialKeyFocus = actor; this._initialKeyFocus = actor;
this._initialKeyFocusDestroyId = actor.connect('destroy', () => { actor.connectObject('destroy',
this._initialKeyFocus = null; () => (this._initialKeyFocus = null), this);
this._initialKeyFocusDestroyId = 0;
});
} }
open(timestamp, onPrimary) { open(timestamp, onPrimary) {

25
js/ui/mpris.js
View File

@ -47,19 +47,12 @@ class MediaMessage extends MessageList.Message {
this._player.next(); this._player.next();
}); });
this._updateHandlerId = this._player.connectObject(
this._player.connect('changed', this._update.bind(this)); 'changed', this._update.bind(this),
this._closedHandlerId = 'closed', this.close.bind(this), this);
this._player.connect('closed', this.close.bind(this));
this._update(); this._update();
} }
_onDestroy() {
super._onDestroy();
this._player.disconnect(this._updateHandlerId);
this._player.disconnect(this._closedHandlerId);
}
vfunc_clicked() { vfunc_clicked() {
this._player.raise(); this._player.raise();
Main.panel.closeCalendar(); Main.panel.closeCalendar();
@ -161,21 +154,21 @@ var MprisPlayer = class MprisPlayer {
} }
_close() { _close() {
this._mprisProxy.disconnect(this._ownerNotifyId); this._mprisProxy.disconnectObject(this);
this._mprisProxy = null; this._mprisProxy = null;
this._playerProxy.disconnect(this._propsChangedId); this._playerProxy.disconnectObject(this);
this._playerProxy = null; this._playerProxy = null;
this.emit('closed'); this.emit('closed');
} }
_onMprisProxyReady() { _onMprisProxyReady() {
this._ownerNotifyId = this._mprisProxy.connect('notify::g-name-owner', this._mprisProxy.connectObject('notify::g-name-owner',
() => { () => {
if (!this._mprisProxy.g_name_owner) if (!this._mprisProxy.g_name_owner)
this._close(); this._close();
}); }, this);
// It is possible for the bus to disappear before the previous signal // It is possible for the bus to disappear before the previous signal
// is connected, so we must ensure that the bus still exists at this // is connected, so we must ensure that the bus still exists at this
// point. // point.
@ -184,8 +177,8 @@ var MprisPlayer = class MprisPlayer {
} }
_onPlayerProxyReady() { _onPlayerProxyReady() {
this._propsChangedId = this._playerProxy.connect('g-properties-changed', this._playerProxy.connectObject(
this._updateState.bind(this)); 'g-properties-changed', () => this._updateState(), this);
this._updateState(); this._updateState();
} }

11
js/ui/overviewControls.js
View File

@ -338,9 +338,8 @@ class ControlsManager extends St.Widget {
this._stateAdjustment = new OverviewAdjustment(this); this._stateAdjustment = new OverviewAdjustment(this);
this._stateAdjustment.connect('notify::value', this._update.bind(this)); this._stateAdjustment.connect('notify::value', this._update.bind(this));
this._nWorkspacesNotifyId = workspaceManager.connectObject(
workspaceManager.connect('notify::n-workspaces', 'notify::n-workspaces', () => this._updateAdjustment(), this);
this._updateAdjustment.bind(this));
this._searchController = new SearchController.SearchController( this._searchController = new SearchController.SearchController(
this._searchEntry, this._searchEntry,
@ -489,8 +488,6 @@ class ControlsManager extends St.Widget {
Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW, Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
() => this._shiftState(Meta.MotionDirection.DOWN)); () => this._shiftState(Meta.MotionDirection.DOWN));
this.connect('destroy', this._onDestroy.bind(this));
this._update(); this._update();
} }
@ -686,10 +683,6 @@ class ControlsManager extends St.Widget {
} }
} }
_onDestroy() {
global.workspace_manager.disconnect(this._nWorkspacesNotifyId);
}
_updateAdjustment() { _updateAdjustment() {
let workspaceManager = global.workspace_manager; let workspaceManager = global.workspace_manager;
let newNumWorkspaces = workspaceManager.n_workspaces; let newNumWorkspaces = workspaceManager.n_workspaces;

23
js/ui/padOsd.js
View File

@ -652,16 +652,17 @@ var PadOsd = GObject.registerClass({
this._padChooser = null; this._padChooser = null;
let seat = Clutter.get_default_backend().get_default_seat(); let seat = Clutter.get_default_backend().get_default_seat();
this._deviceAddedId = seat.connect('device-added', (_seat, device) => { seat.connectObject(
if (device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE && 'device-added', (_seat, device) => {
if (device.get_device_type() === Clutter.InputDeviceType.PAD_DEVICE &&
this.padDevice.is_grouped(device)) { this.padDevice.is_grouped(device)) {
this._groupPads.push(device); this._groupPads.push(device);
this._updatePadChooser(); this._updatePadChooser();
} }
}); },
this._deviceRemovedId = seat.connect('device-removed', (_seat, device) => { 'device-removed', (_seat, device) => {
// If the device is being removed, destroy the padOsd. // If the device is being removed, destroy the padOsd.
if (device == this.padDevice) { if (device === this.padDevice) {
this.destroy(); this.destroy();
} else if (this._groupPads.includes(device)) { } else if (this._groupPads.includes(device)) {
// Or update the pad chooser if the device belongs to // Or update the pad chooser if the device belongs to
@ -669,7 +670,7 @@ var PadOsd = GObject.registerClass({
this._groupPads.splice(this._groupPads.indexOf(device), 1); this._groupPads.splice(this._groupPads.indexOf(device), 1);
this._updatePadChooser(); this._updatePadChooser();
} }
}); }, this);
seat.list_devices().forEach(device => { seat.list_devices().forEach(device => {
if (device != this.padDevice && if (device != this.padDevice &&
@ -944,16 +945,6 @@ var PadOsd = GObject.registerClass({
this._grab = null; this._grab = null;
this._actionEditor.close(); this._actionEditor.close();
let seat = Clutter.get_default_backend().get_default_seat();
if (this._deviceRemovedId != 0) {
seat.disconnect(this._deviceRemovedId);
this._deviceRemovedId = 0;
}
if (this._deviceAddedId != 0) {
seat.disconnect(this._deviceAddedId);
this._deviceAddedId = 0;
}
this.emit('closed'); this.emit('closed');
} }
}); });

54
js/ui/panel.js
View File

@ -38,7 +38,6 @@ var AppMenuButton = GObject.registerClass({
this._menuManager = panel.menuManager; this._menuManager = panel.menuManager;
this._targetApp = null; this._targetApp = null;
this._busyNotifyId = 0;
let bin = new St.Bin({ name: 'appMenu' }); let bin = new St.Bin({ name: 'appMenu' });
this.add_actor(bin); this.add_actor(bin);
@ -75,8 +74,9 @@ var AppMenuButton = GObject.registerClass({
this._visible = !Main.overview.visible; this._visible = !Main.overview.visible;
if (!this._visible) if (!this._visible)
this.hide(); this.hide();
this._overviewHidingId = Main.overview.connect('hiding', this._sync.bind(this)); Main.overview.connectObject(
this._overviewShowingId = Main.overview.connect('showing', this._sync.bind(this)); 'hiding', this._sync.bind(this),
'showing', this._sync.bind(this), this);
this._spinner = new Animation.Spinner(PANEL_ICON_SIZE, { this._spinner = new Animation.Spinner(PANEL_ICON_SIZE, {
animate: true, animate: true,
@ -88,14 +88,12 @@ var AppMenuButton = GObject.registerClass({
this.setMenu(menu); this.setMenu(menu);
this._menuManager.addMenu(menu); this._menuManager.addMenu(menu);
let tracker = Shell.WindowTracker.get_default(); Shell.WindowTracker.get_default().connectObject('notify::focus-app',
let appSys = Shell.AppSystem.get_default(); this._focusAppChanged.bind(this), this);
this._focusAppNotifyId = Shell.AppSystem.get_default().connectObject('app-state-changed',
tracker.connect('notify::focus-app', this._focusAppChanged.bind(this)); this._onAppStateChanged.bind(this), this);
this._appStateChangedSignalId = global.window_manager.connectObject('switch-workspace',
appSys.connect('app-state-changed', this._onAppStateChanged.bind(this)); this._sync.bind(this), this);
this._switchWorkspaceNotifyId =
global.window_manager.connect('switch-workspace', this._sync.bind(this));
this._sync(); this._sync();
} }
@ -195,15 +193,12 @@ var AppMenuButton = GObject.registerClass({
let targetApp = this._findTargetApp(); let targetApp = this._findTargetApp();
if (this._targetApp != targetApp) { if (this._targetApp != targetApp) {
if (this._busyNotifyId) { this._targetApp?.disconnectObject(this);
this._targetApp.disconnect(this._busyNotifyId);
this._busyNotifyId = 0;
}
this._targetApp = targetApp; this._targetApp = targetApp;
if (this._targetApp) { if (this._targetApp) {
this._busyNotifyId = this._targetApp.connect('notify::busy', this._sync.bind(this)); this._targetApp.connectObject('notify::busy', this._sync.bind(this), this);
this._label.set_text(this._targetApp.get_name()); this._label.set_text(this._targetApp.get_name());
this.set_accessible_name(this._targetApp.get_name()); this.set_accessible_name(this._targetApp.get_name());
@ -230,33 +225,6 @@ var AppMenuButton = GObject.registerClass({
this.menu.setApp(this._targetApp); this.menu.setApp(this._targetApp);
this.emit('changed'); this.emit('changed');
} }
_onDestroy() {
if (this._appStateChangedSignalId > 0) {
let appSys = Shell.AppSystem.get_default();
appSys.disconnect(this._appStateChangedSignalId);
this._appStateChangedSignalId = 0;
}
if (this._focusAppNotifyId > 0) {
let tracker = Shell.WindowTracker.get_default();
tracker.disconnect(this._focusAppNotifyId);
this._focusAppNotifyId = 0;
}
if (this._overviewHidingId > 0) {
Main.overview.disconnect(this._overviewHidingId);
this._overviewHidingId = 0;
}
if (this._overviewShowingId > 0) {
Main.overview.disconnect(this._overviewShowingId);
this._overviewShowingId = 0;
}
if (this._switchWorkspaceNotifyId > 0) {
global.window_manager.disconnect(this._switchWorkspaceNotifyId);
this._switchWorkspaceNotifyId = 0;
}
super._onDestroy();
}
}); });
var ActivitiesButton = GObject.registerClass( var ActivitiesButton = GObject.registerClass(

158
js/ui/popupMenu.js
View File

@ -506,7 +506,7 @@ var PopupMenuBase = class {
this._sensitive = true; this._sensitive = true;
this._sessionUpdatedId = Main.sessionMode.connect('updated', this._sessionUpdated.bind(this)); Main.sessionMode.connectObject('updated', () => this._sessionUpdated(), this);
} }
_getTopMenu() { _getTopMenu() {
@ -609,52 +609,41 @@ var PopupMenuBase = class {
} }
_connectItemSignals(menuItem) { _connectItemSignals(menuItem) {
menuItem._activeChangeId = menuItem.connect('notify::active', () => { menuItem.connectObject(
let active = menuItem.active; 'notify::active', () => {
if (active && this._activeMenuItem != menuItem) { const { active } = menuItem;
if (active && this._activeMenuItem !== menuItem) {
if (this._activeMenuItem) if (this._activeMenuItem)
this._activeMenuItem.active = false; this._activeMenuItem.active = false;
this._activeMenuItem = menuItem; this._activeMenuItem = menuItem;
this.emit('active-changed', menuItem); this.emit('active-changed', menuItem);
} else if (!active && this._activeMenuItem == menuItem) { } else if (!active && this._activeMenuItem === menuItem) {
this._activeMenuItem = null; this._activeMenuItem = null;
this.emit('active-changed', null); this.emit('active-changed', null);
} }
}); },
menuItem._sensitiveChangeId = menuItem.connect('notify::sensitive', () => { 'notify::sensitive', () => {
let sensitive = menuItem.sensitive; const { sensitive } = menuItem;
if (!sensitive && this._activeMenuItem == menuItem) { if (!sensitive && this._activeMenuItem === menuItem) {
if (!this.actor.navigate_focus(menuItem.actor, if (!this.actor.navigate_focus(menuItem.actor,
St.DirectionType.TAB_FORWARD, St.DirectionType.TAB_FORWARD, true))
true))
this.actor.grab_key_focus(); this.actor.grab_key_focus();
} else if (sensitive && this._activeMenuItem == null) { } else if (sensitive && this._activeMenuItem === null) {
if (global.stage.get_key_focus() == this.actor) if (global.stage.get_key_focus() === this.actor)
menuItem.actor.grab_key_focus(); menuItem.actor.grab_key_focus();
} }
}); },
menuItem._activateId = menuItem.connect_after('activate', () => { 'activate', () => {
this.emit('activate', menuItem); this.emit('activate', menuItem);
this.itemActivated(BoxPointer.PopupAnimation.FULL); this.itemActivated(BoxPointer.PopupAnimation.FULL);
}); }, GObject.ConnectFlags.AFTER,
'destroy', () => {
menuItem._parentSensitiveChangeId = this.connect('notify::sensitive', () => { if (menuItem === this._activeMenuItem)
menuItem.syncSensitive();
});
// the weird name is to avoid a conflict with some random property
// the menuItem may have, called destroyId
// (FIXME: in the future it may make sense to have container objects
// like PopupMenuManager does)
menuItem._popupMenuDestroyId = menuItem.connect('destroy', () => {
menuItem.disconnect(menuItem._popupMenuDestroyId);
menuItem.disconnect(menuItem._activateId);
menuItem.disconnect(menuItem._activeChangeId);
menuItem.disconnect(menuItem._sensitiveChangeId);
this.disconnect(menuItem._parentSensitiveChangeId);
if (menuItem == this._activeMenuItem)
this._activeMenuItem = null; this._activeMenuItem = null;
}); }, this);
this.connectObject('notify::sensitive',
() => menuItem.syncSensitive(), menuItem);
} }
_updateSeparatorVisibility(menuItem) { _updateSeparatorVisibility(menuItem) {
@ -726,28 +715,20 @@ var PopupMenuBase = class {
} }
if (menuItem instanceof PopupMenuSection) { if (menuItem instanceof PopupMenuSection) {
let activeChangeId = menuItem.connect('active-changed', this._subMenuActiveChanged.bind(this)); menuItem.connectObject(
'active-changed', this._subMenuActiveChanged.bind(this),
'destroy', () => this.length--, this);
let parentOpenStateChangedId = this.connect('open-state-changed', (self, open) => { this.connectObject(
'open-state-changed', (self, open) => {
if (open) if (open)
menuItem.open(); menuItem.open();
else else
menuItem.close(); menuItem.close();
}); },
let parentClosingId = this.connect('menu-closed', () => { 'menu-closed', () => menuItem.emit('menu-closed'),
menuItem.emit('menu-closed'); 'notify::sensitive', () => menuItem.emit('notify::sensitive'),
}); menuItem);
let subMenuSensitiveChangedId = this.connect('notify::sensitive', () => {
menuItem.emit('notify::sensitive');
});
menuItem.connect('destroy', () => {
menuItem.disconnect(activeChangeId);
this.disconnect(subMenuSensitiveChangedId);
this.disconnect(parentOpenStateChangedId);
this.disconnect(parentClosingId);
this.length--;
});
} else if (menuItem instanceof PopupSubMenuMenuItem) { } else if (menuItem instanceof PopupSubMenuMenuItem) {
if (beforeItem == null) if (beforeItem == null)
this.box.add(menuItem.menu.actor); this.box.add(menuItem.menu.actor);
@ -755,15 +736,11 @@ var PopupMenuBase = class {
this.box.insert_child_below(menuItem.menu.actor, beforeItem); this.box.insert_child_below(menuItem.menu.actor, beforeItem);
this._connectItemSignals(menuItem); this._connectItemSignals(menuItem);
let subMenuActiveChangeId = menuItem.menu.connect('active-changed', this._subMenuActiveChanged.bind(this)); menuItem.menu.connectObject('active-changed',
let closingId = this.connect('menu-closed', () => { this._subMenuActiveChanged.bind(this), this);
this.connectObject('menu-closed', () => {
menuItem.menu.close(BoxPointer.PopupAnimation.NONE); menuItem.menu.close(BoxPointer.PopupAnimation.NONE);
}); }, menuItem);
menuItem.connect('destroy', () => {
menuItem.menu.disconnect(subMenuActiveChangeId);
this.disconnect(closingId);
});
} else if (menuItem instanceof PopupSeparatorMenuItem) { } else if (menuItem instanceof PopupSeparatorMenuItem) {
this._connectItemSignals(menuItem); this._connectItemSignals(menuItem);
@ -771,13 +748,9 @@ var PopupMenuBase = class {
// separator's adjacent siblings change visibility or position. // separator's adjacent siblings change visibility or position.
// open-state-changed isn't exactly that, but doing it in more // open-state-changed isn't exactly that, but doing it in more
// precise ways would require a lot more bookkeeping. // precise ways would require a lot more bookkeeping.
let openStateChangeId = this.connect('open-state-changed', () => { this.connectObject('open-state-changed', () => {
this._updateSeparatorVisibility(menuItem); this._updateSeparatorVisibility(menuItem);
}); }, menuItem);
let destroyId = menuItem.connect('destroy', () => {
this.disconnect(openStateChangeId);
menuItem.disconnect(destroyId);
});
} else if (menuItem instanceof PopupBaseMenuItem) { } else if (menuItem instanceof PopupBaseMenuItem) {
this._connectItemSignals(menuItem); this._connectItemSignals(menuItem);
} else { } else {
@ -829,8 +802,7 @@ var PopupMenuBase = class {
this.emit('destroy'); this.emit('destroy');
Main.sessionMode.disconnect(this._sessionUpdatedId); Main.sessionMode.disconnectObject(this);
this._sessionUpdatedId = 0;
} }
}; };
Signals.addSignalMethods(PopupMenuBase.prototype); Signals.addSignalMethods(PopupMenuBase.prototype);
@ -854,13 +826,12 @@ var PopupMenu = class extends PopupMenuBase {
this.actor.reactive = true; this.actor.reactive = true;
if (this.sourceActor) { if (this.sourceActor) {
this._keyPressId = this.sourceActor.connect('key-press-event', this.sourceActor.connectObject(
this._onKeyPress.bind(this)); 'key-press-event', this._onKeyPress.bind(this),
this._notifyMappedId = this.sourceActor.connect('notify::mapped', 'notify::mapped', () => {
() => {
if (!this.sourceActor.mapped) if (!this.sourceActor.mapped)
this.close(); this.close();
}); }, this);
} }
this._systemModalOpenedId = 0; this._systemModalOpenedId = 0;
@ -970,11 +941,7 @@ var PopupMenu = class extends PopupMenuBase {
} }
destroy() { destroy() {
if (this._keyPressId) this.sourceActor?.disconnectObject(this);
this.sourceActor.disconnect(this._keyPressId);
if (this._notifyMappedId)
this.sourceActor.disconnect(this._notifyMappedId);
if (this._systemModalOpenedId) if (this._systemModalOpenedId)
Main.layoutManager.disconnect(this._systemModalOpenedId); Main.layoutManager.disconnect(this._systemModalOpenedId);
@ -1333,20 +1300,19 @@ var PopupMenuManager = class {
} }
addMenu(menu, position) { addMenu(menu, position) {
if (this._findMenu(menu) > -1) if (this._menus.includes(menu))
return; return;
let menudata = { menu.connectObject(
menu, 'open-state-changed', this._onMenuOpenState.bind(this),
openStateChangeId: menu.connect('open-state-changed', this._onMenuOpenState.bind(this)), 'destroy', () => this.removeMenu(menu), this);
destroyId: menu.connect('destroy', this._onMenuDestroy.bind(this)), menu.actor.connectObject('captured-event',
capturedEventId: menu.actor.connect('captured-event', this._onCapturedEvent.bind(this)), this._onCapturedEvent.bind(this), this);
};
if (position == undefined) if (position == undefined)
this._menus.push(menudata); this._menus.push(menu);
else else
this._menus.splice(position, 0, menudata); this._menus.splice(position, 0, menu);
} }
removeMenu(menu) { removeMenu(menu) {
@ -1355,13 +1321,12 @@ var PopupMenuManager = class {
this._grab = null; this._grab = null;
} }
let position = this._findMenu(menu); const position = this._menus.indexOf(menu);
if (position == -1) // not a menu we manage if (position == -1) // not a menu we manage
return; return;
let menudata = this._menus[position]; menu.disconnectObject(this);
menu.disconnect(menudata.openStateChangeId); menu.actor.disconnectObject(this);
menu.disconnect(menudata.destroyId);
this._menus.splice(position, 1); this._menus.splice(position, 1);
} }
@ -1426,7 +1391,7 @@ var PopupMenuManager = class {
_findMenuForSource(source) { _findMenuForSource(source) {
while (source) { while (source) {
let actor = source; let actor = source;
const menu = this._menus.map(m => m.menu).find(m => m.sourceActor === actor); const menu = this._menus.find(m => m.sourceActor === actor);
if (menu) if (menu)
return menu; return menu;
source = source.get_parent(); source = source.get_parent();
@ -1435,19 +1400,6 @@ var PopupMenuManager = class {
return null; return null;
} }
_onMenuDestroy(menu) {
this.removeMenu(menu);
}
_findMenu(item) {
for (let i = 0; i < this._menus.length; i++) {
let menudata = this._menus[i];
if (item == menudata.menu)
return i;
}
return -1;
}
_closeMenu(isUser, menu) { _closeMenu(isUser, menu) {
// If this isn't a user action, we called close() // If this isn't a user action, we called close()
// on the BoxPointer ourselves, so we shouldn't // on the BoxPointer ourselves, so we shouldn't

15
js/ui/search.js
View File

@ -79,8 +79,6 @@ class ListSearchResult extends SearchResult {
}); });
this.set_child(content); this.set_child(content);
this._termsChangedId = 0;
let titleBox = new St.BoxLayout({ let titleBox = new St.BoxLayout({
style_class: 'list-search-result-title', style_class: 'list-search-result-title',
y_align: Clutter.ActorAlign.CENTER, y_align: Clutter.ActorAlign.CENTER,
@ -108,14 +106,11 @@ class ListSearchResult extends SearchResult {
}); });
content.add_child(this._descriptionLabel); content.add_child(this._descriptionLabel);
this._termsChangedId = this._resultsView.connectObject(
this._resultsView.connect('terms-changed', 'terms-changed', this._highlightTerms.bind(this), this);
this._highlightTerms.bind(this));
this._highlightTerms(); this._highlightTerms();
} }
this.connect('destroy', this._onDestroy.bind(this));
} }
get ICON_SIZE() { get ICON_SIZE() {
@ -126,12 +121,6 @@ class ListSearchResult extends SearchResult {
let markup = this._resultsView.highlightTerms(this.metaInfo['description'].split('\n')[0]); let markup = this._resultsView.highlightTerms(this.metaInfo['description'].split('\n')[0]);
this._descriptionLabel.clutter_text.set_markup(markup); this._descriptionLabel.clutter_text.set_markup(markup);
} }
_onDestroy() {
if (this._termsChangedId)
this._resultsView.disconnect(this._termsChangedId);
this._termsChangedId = 0;
}
}); });
var GridSearchResult = GObject.registerClass( var GridSearchResult = GObject.registerClass(

12
js/ui/shellEntry.js
View File

@ -174,20 +174,14 @@ class CapsLockWarning extends St.Label {
this.connect('notify::mapped', () => { this.connect('notify::mapped', () => {
if (this.is_mapped()) { if (this.is_mapped()) {
this._stateChangedId = this._keymap.connect('state-changed', this._keymap.connectObject(
() => this._sync(true)); 'state-changed', () => this._sync(true), this);
} else { } else {
this._keymap.disconnect(this._stateChangedId); this._keymap.disconnectObject(this);
this._stateChangedId = 0;
} }
this._sync(false); this._sync(false);
}); });
this.connect('destroy', () => {
if (this._stateChangedId)
this._keymap.disconnect(this._stateChangedId);
});
} }
_sync(animate) { _sync(animate) {

19
js/ui/shellMountOperation.js
View File

@ -54,7 +54,6 @@ var ShellMountOperation = class {
params = Params.parse(params, { existingDialog: null }); params = Params.parse(params, { existingDialog: null });
this._dialog = null; this._dialog = null;
this._dialogId = 0;
this._existingDialog = params.existingDialog; this._existingDialog = params.existingDialog;
this._processesDialog = null; this._processesDialog = null;
@ -84,13 +83,13 @@ var ShellMountOperation = class {
this._closeExistingDialog(); this._closeExistingDialog();
this._dialog = new ShellMountQuestionDialog(); this._dialog = new ShellMountQuestionDialog();
this._dialogId = this._dialog.connect('response', this._dialog.connectObject('response',
(object, choice) => { (object, choice) => {
this.mountOp.set_choice(choice); this.mountOp.set_choice(choice);
this.mountOp.reply(Gio.MountOperationResult.HANDLED); this.mountOp.reply(Gio.MountOperationResult.HANDLED);
this.close(); this.close();
}); }, this);
this._dialog.update(message, choices); this._dialog.update(message, choices);
this._dialog.open(); this._dialog.open();
@ -104,7 +103,7 @@ var ShellMountOperation = class {
this._dialog = new ShellMountPasswordDialog(message, flags); this._dialog = new ShellMountPasswordDialog(message, flags);
} }
this._dialogId = this._dialog.connect('response', this._dialog.connectObject('response',
(object, choice, password, remember, hiddenVolume, systemVolume, pim) => { (object, choice, password, remember, hiddenVolume, systemVolume, pim) => {
if (choice == -1) { if (choice == -1) {
this.mountOp.reply(Gio.MountOperationResult.ABORTED); this.mountOp.reply(Gio.MountOperationResult.ABORTED);
@ -120,7 +119,7 @@ var ShellMountOperation = class {
this.mountOp.set_pim(pim); this.mountOp.set_pim(pim);
this.mountOp.reply(Gio.MountOperationResult.HANDLED); this.mountOp.reply(Gio.MountOperationResult.HANDLED);
} }
}); }, this);
this._dialog.open(); this._dialog.open();
} }
@ -150,7 +149,7 @@ var ShellMountOperation = class {
this._processesDialog = new ShellProcessesDialog(); this._processesDialog = new ShellProcessesDialog();
this._dialog = this._processesDialog; this._dialog = this._processesDialog;
this._dialogId = this._processesDialog.connect('response', this._processesDialog.connectObject('response',
(object, choice) => { (object, choice) => {
if (choice == -1) { if (choice == -1) {
this.mountOp.reply(Gio.MountOperationResult.ABORTED); this.mountOp.reply(Gio.MountOperationResult.ABORTED);
@ -160,7 +159,7 @@ var ShellMountOperation = class {
} }
this.close(); this.close();
}); }, this);
this._processesDialog.open(); this._processesDialog.open();
} }
@ -178,11 +177,7 @@ var ShellMountOperation = class {
} }
borrowDialog() { borrowDialog() {
if (this._dialogId != 0) { this._dialog?.disconnectObject(this);
this._dialog.disconnect(this._dialogId);
this._dialogId = 0;
}
return this._dialog; return this._dialog;
} }
}; };

25
js/ui/status/keyboard.js
View File

@ -349,8 +349,6 @@ var InputSourceManager = class {
this._sourcesPerWindow = false; this._sourcesPerWindow = false;
this._focusWindowNotifyId = 0; this._focusWindowNotifyId = 0;
this._overviewShowingId = 0;
this._overviewHiddenId = 0;
this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this)); this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this));
this._sourcesPerWindowChanged(); this._sourcesPerWindowChanged();
this._disableIBus = false; this._disableIBus = false;
@ -731,17 +729,13 @@ var InputSourceManager = class {
if (this._sourcesPerWindow && this._focusWindowNotifyId == 0) { if (this._sourcesPerWindow && this._focusWindowNotifyId == 0) {
this._focusWindowNotifyId = global.display.connect('notify::focus-window', this._focusWindowNotifyId = global.display.connect('notify::focus-window',
this._setPerWindowInputSource.bind(this)); this._setPerWindowInputSource.bind(this));
this._overviewShowingId = Main.overview.connect('showing', Main.overview.connectObject(
this._setPerWindowInputSource.bind(this)); 'showing', this._setPerWindowInputSource.bind(this),
this._overviewHiddenId = Main.overview.connect('hidden', 'hidden', this._setPerWindowInputSource.bind(this), this);
this._setPerWindowInputSource.bind(this));
} else if (!this._sourcesPerWindow && this._focusWindowNotifyId != 0) { } else if (!this._sourcesPerWindow && this._focusWindowNotifyId != 0) {
global.display.disconnect(this._focusWindowNotifyId); global.display.disconnect(this._focusWindowNotifyId);
this._focusWindowNotifyId = 0; this._focusWindowNotifyId = 0;
Main.overview.disconnect(this._overviewShowingId); Main.overview.disconnectObject(this);
this._overviewShowingId = 0;
Main.overview.disconnect(this._overviewHiddenId);
this._overviewHiddenId = 0;
let windows = global.get_window_actors().map(w => w.meta_window); let windows = global.get_window_actors().map(w => w.meta_window);
for (let i = 0; i < windows.length; ++i) { for (let i = 0; i < windows.length; ++i) {
@ -853,20 +847,15 @@ class InputSourceIndicator extends PanelMenu.Button {
this._sessionUpdated(); this._sessionUpdated();
this._inputSourceManager = getInputSourceManager(); this._inputSourceManager = getInputSourceManager();
this._inputSourceManagerSourcesChangedId = this._inputSourceManager.connectObject(
this._inputSourceManager.connect('sources-changed', this._sourcesChanged.bind(this)); 'sources-changed', this._sourcesChanged.bind(this),
this._inputSourceManagerCurrentSourceChangedId = 'current-source-changed', this._currentSourceChanged.bind(this), this);
this._inputSourceManager.connect('current-source-changed', this._currentSourceChanged.bind(this));
this._inputSourceManager.reload(); this._inputSourceManager.reload();
} }
_onDestroy() { _onDestroy() {
if (this._inputSourceManager) {
this._inputSourceManager.disconnect(this._inputSourceManagerSourcesChangedId);
this._inputSourceManager.disconnect(this._inputSourceManagerCurrentSourceChangedId);
this._inputSourceManager = null; this._inputSourceManager = null;
} }
}
_sessionUpdated() { _sessionUpdated() {
// re-using "allowSettings" for the keyboard layout is a bit shady, // re-using "allowSettings" for the keyboard layout is a bit shady,

31
js/ui/status/location.js
View File

@ -69,10 +69,10 @@ var GeoclueAgent = GObject.registerClass({
super._init(); super._init();
this._settings = new Gio.Settings({ schema_id: LOCATION_SCHEMA }); this._settings = new Gio.Settings({ schema_id: LOCATION_SCHEMA });
this._settings.connect(`changed::${ENABLED}`, this._settings.connectObject(
() => this.notify('enabled')); `changed::${ENABLED}`, () => this.notify('enabled'),
this._settings.connect(`changed::${MAX_ACCURACY_LEVEL}`, `changed::${MAX_ACCURACY_LEVEL}`, () => this._onMaxAccuracyLevelChanged(),
this._onMaxAccuracyLevelChanged.bind(this)); this);
this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this); this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this);
this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent'); this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent');
@ -149,8 +149,8 @@ var GeoclueAgent = GObject.registerClass({
} }
this._managerProxy = proxy; this._managerProxy = proxy;
this._propertiesChangedId = this._managerProxy.connect('g-properties-changed', this._managerProxy.connectObject('g-properties-changed',
this._onGeocluePropsChanged.bind(this)); this._onGeocluePropsChanged.bind(this), this);
this.notify('in-use'); this.notify('in-use');
@ -166,10 +166,7 @@ var GeoclueAgent = GObject.registerClass({
} }
_onGeoclueVanished() { _onGeoclueVanished() {
if (this._propertiesChangedId) { this._managerProxy.disconnectObject(this);
this._managerProxy.disconnect(this._propertiesChangedId);
this._propertiesChangedId = 0;
}
this._managerProxy = null; this._managerProxy = null;
this.notify('in-use'); this.notify('in-use');
@ -238,22 +235,14 @@ class Indicator extends PanelMenu.SystemIndicator {
this.menu.addMenuItem(this._item); this.menu.addMenuItem(this._item);
this._agentSignals = [ this._agent.connectObject(
this._agent.connect('notify::enabled', () => this._sync()), 'notify::enabled', () => this._sync(),
this._agent.connect('notify::in-use', () => this._sync()), 'notify::in-use', () => this._sync(), this);
];
this.connect('destroy', this._onDestroy.bind(this));
Main.sessionMode.connect('updated', this._onSessionUpdated.bind(this)); Main.sessionMode.connect('updated', this._onSessionUpdated.bind(this));
this._onSessionUpdated(); this._onSessionUpdated();
} }
_onDestroy() {
this._agentSignals.forEach(id => this._agent.disconnect(id));
this._agentSignals = [];
}
_onSessionUpdated() { _onSessionUpdated() {
let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
this.menu.setSensitive(sensitive); this.menu.setSensitive(sensitive);

208
js/ui/status/network.js
View File

@ -112,7 +112,6 @@ var NMConnectionItem = class {
this._section = section; this._section = section;
this._connection = connection; this._connection = connection;
this._activeConnection = null; this._activeConnection = null;
this._activeConnectionChangedId = 0;
this._buildUI(); this._buildUI();
this._sync(); this._sync();
@ -127,11 +126,7 @@ var NMConnectionItem = class {
} }
destroy() { destroy() {
if (this._activeConnectionChangedId) { this._activeConnection?.disconnectObject(this);
this._activeConnection.disconnect(this._activeConnectionChangedId);
this._activeConnectionChangedId = 0;
}
this.labelItem.destroy(); this.labelItem.destroy();
this.radioItem.destroy(); this.radioItem.destroy();
} }
@ -188,17 +183,12 @@ var NMConnectionItem = class {
} }
setActiveConnection(activeConnection) { setActiveConnection(activeConnection) {
if (this._activeConnectionChangedId > 0) { this._activeConnection?.disconnectObject(this);
this._activeConnection.disconnect(this._activeConnectionChangedId);
this._activeConnectionChangedId = 0;
}
this._activeConnection = activeConnection; this._activeConnection = activeConnection;
if (this._activeConnection) { this._activeConnection?.connectObject('notify::state',
this._activeConnectionChangedId = this._activeConnection.connect('notify::state', this._connectionStateChanged.bind(this), this);
this._connectionStateChanged.bind(this));
}
this._sync(); this._sync();
} }
@ -222,15 +212,12 @@ var NMConnectionSection = class NMConnectionSection {
this.item.menu.addMenuItem(this._labelSection); this.item.menu.addMenuItem(this._labelSection);
this.item.menu.addMenuItem(this._radioSection); this.item.menu.addMenuItem(this._radioSection);
this._notifyConnectivityId = this._client.connect('notify::connectivity', this._iconChanged.bind(this)); this._client.connectObject('notify::connectivity',
this._iconChanged.bind(this), this);
} }
destroy() { destroy() {
if (this._notifyConnectivityId != 0) { this._client.disconnectObject(this);
this._client.disconnect(this._notifyConnectivityId);
this._notifyConnectivityId = 0;
}
this.item.destroy(); this.item.destroy();
} }
@ -348,8 +335,10 @@ var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection {
this._autoConnectItem = this.item.menu.addAction(_("Connect"), this._autoConnect.bind(this)); this._autoConnectItem = this.item.menu.addAction(_("Connect"), this._autoConnect.bind(this));
this._deactivateItem = this._radioSection.addAction(_("Turn Off"), this.deactivateConnection.bind(this)); this._deactivateItem = this._radioSection.addAction(_("Turn Off"), this.deactivateConnection.bind(this));
this._stateChangedId = this._device.connect('state-changed', this._deviceStateChanged.bind(this)); this._device.connectObject(
this._activeConnectionChangedId = this._device.connect('notify::active-connection', this._activeConnectionChanged.bind(this)); 'state-changed', this._deviceStateChanged.bind(this),
'notify::active-connection', this._activeConnectionChanged.bind(this),
this);
} }
_canReachInternet() { _canReachInternet() {
@ -365,14 +354,7 @@ var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection {
} }
destroy() { destroy() {
if (this._stateChangedId) { this._device.disconnectObject(this);
GObject.signal_handler_disconnect(this._device, this._stateChangedId);
this._stateChangedId = 0;
}
if (this._activeConnectionChangedId) {
GObject.signal_handler_disconnect(this._device, this._activeConnectionChangedId);
this._activeConnectionChangedId = 0;
}
super.destroy(); super.destroy();
} }
@ -560,15 +542,12 @@ var NMDeviceModem = class extends NMConnectionDevice {
else if (capabilities & NM.DeviceModemCapabilities.LTE) else if (capabilities & NM.DeviceModemCapabilities.LTE)
this._mobileDevice = new ModemManager.ModemGsm(device.udi); this._mobileDevice = new ModemManager.ModemGsm(device.udi);
if (this._mobileDevice) { this._mobileDevice?.connectObject(
this._operatorNameId = this._mobileDevice.connect('notify::operator-name', this._sync.bind(this)); 'notify::operator-name', this._sync.bind(this),
this._signalQualityId = this._mobileDevice.connect('notify::signal-quality', () => { 'notify::signal-quality', () => this._iconChanged(), this);
this._iconChanged();
});
}
this._sessionUpdatedId = Main.sessionMode.connectObject('updated',
Main.sessionMode.connect('updated', this._sessionUpdated.bind(this)); this._sessionUpdated.bind(this), this);
this._sessionUpdated(); this._sessionUpdated();
} }
@ -596,18 +575,8 @@ var NMDeviceModem = class extends NMConnectionDevice {
} }
destroy() { destroy() {
if (this._operatorNameId) { this._mobileDevice?.disconnectObject(this);
this._mobileDevice.disconnect(this._operatorNameId); Main.sessionMode.disconnectObject(this);
this._operatorNameId = 0;
}
if (this._signalQualityId) {
this._mobileDevice.disconnect(this._signalQualityId);
this._signalQualityId = 0;
}
if (this._sessionUpdatedId) {
Main.sessionMode.disconnect(this._sessionUpdatedId);
this._sessionUpdatedId = 0;
}
super.destroy(); super.destroy();
} }
@ -775,12 +744,12 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
this._client = client; this._client = client;
this._device = device; this._device = device;
this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', this._client.connectObject('notify::wireless-enabled',
this._syncView.bind(this)); this._syncView.bind(this), this);
this._rfkill = Rfkill.getRfkillManager(); this._rfkill = Rfkill.getRfkillManager();
this._airplaneModeChangedId = this._rfkill.connect('airplane-mode-changed', this._rfkill.connectObject('airplane-mode-changed',
this._syncView.bind(this)); this._syncView.bind(this), this);
this._networks = []; this._networks = [];
this._buildLayout(); this._buildLayout();
@ -789,9 +758,10 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
this._connections = connections.filter( this._connections = connections.filter(
connection => device.connection_valid(connection)); connection => device.connection_valid(connection));
this._apAddedId = device.connect('access-point-added', this._accessPointAdded.bind(this)); device.connectObject(
this._apRemovedId = device.connect('access-point-removed', this._accessPointRemoved.bind(this)); 'access-point-added', this._accessPointAdded.bind(this),
this._activeApChangedId = device.connect('notify::active-access-point', this._activeApChanged.bind(this)); 'access-point-removed', this._accessPointRemoved.bind(this),
'notify::active-access-point', this._activeApChanged.bind(this), this);
// accessPointAdded will also create dialog items // accessPointAdded will also create dialog items
let accessPoints = device.get_access_points() || []; let accessPoints = device.get_access_points() || [];
@ -820,27 +790,6 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
} }
_onDestroy() { _onDestroy() {
if (this._apAddedId) {
GObject.Object.prototype.disconnect.call(this._device, this._apAddedId);
this._apAddedId = 0;
}
if (this._apRemovedId) {
GObject.Object.prototype.disconnect.call(this._device, this._apRemovedId);
this._apRemovedId = 0;
}
if (this._activeApChangedId) {
GObject.Object.prototype.disconnect.call(this._device, this._activeApChangedId);
this._activeApChangedId = 0;
}
if (this._wirelessEnabledChangedId) {
this._client.disconnect(this._wirelessEnabledChangedId);
this._wirelessEnabledChangedId = 0;
}
if (this._airplaneModeChangedId) {
this._rfkill.disconnect(this._airplaneModeChangedId);
this._airplaneModeChangedId = 0;
}
if (this._scanTimeoutId) { if (this._scanTimeoutId) {
GLib.source_remove(this._scanTimeoutId); GLib.source_remove(this._scanTimeoutId);
this._scanTimeoutId = 0; this._scanTimeoutId = 0;
@ -1043,8 +992,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
_notifySsidCb(accessPoint) { _notifySsidCb(accessPoint) {
if (accessPoint.get_ssid() != null) { if (accessPoint.get_ssid() != null) {
accessPoint.disconnect(accessPoint._notifySsidId); accessPoint.disconnectObject(this);
accessPoint._notifySsidId = 0;
this._accessPointAdded(this._device, accessPoint); this._accessPointAdded(this._device, accessPoint);
} }
} }
@ -1168,7 +1116,8 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
if (accessPoint.get_ssid() == null) { if (accessPoint.get_ssid() == null) {
// This access point is not visible yet // This access point is not visible yet
// Wait for it to get a ssid // Wait for it to get a ssid
accessPoint._notifySsidId = accessPoint.connect('notify::ssid', this._notifySsidCb.bind(this)); accessPoint.connectObject('notify::ssid',
this._notifySsidCb.bind(this), this);
return; return;
} }
@ -1309,11 +1258,14 @@ var NMDeviceWireless = class {
this.item.menu.addSettingsAction(_("Wi-Fi Settings"), 'gnome-wifi-panel.desktop'); this.item.menu.addSettingsAction(_("Wi-Fi Settings"), 'gnome-wifi-panel.desktop');
this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', this._sync.bind(this)); this._client.connectObject(
this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', this._sync.bind(this)); 'notify::wireless-enabled', this._sync.bind(this),
this._activeApChangedId = this._device.connect('notify::active-access-point', this._activeApChanged.bind(this)); 'notify::wireless-hardware-enabled', this._sync.bind(this),
this._stateChangedId = this._device.connect('state-changed', this._deviceStateChanged.bind(this)); 'notify::connectivity', this._iconChanged.bind(this), this);
this._notifyConnectivityId = this._client.connect('notify::connectivity', this._iconChanged.bind(this));
this._device.connectObject(
'notify::active-access-point', this._activeApChanged.bind(this),
'state-changed', this._deviceStateChanged.bind(this), this);
this._sync(); this._sync();
} }
@ -1328,34 +1280,14 @@ var NMDeviceWireless = class {
} }
destroy() { destroy() {
if (this._activeApChangedId) { this._device.disconnectObject(this);
GObject.signal_handler_disconnect(this._device, this._activeApChangedId); this._activeAccessPoint?.disconnectObject(this);
this._activeApChangedId = 0; this._client.disconnectObject(this);
}
if (this._stateChangedId) {
GObject.signal_handler_disconnect(this._device, this._stateChangedId);
this._stateChangedId = 0;
}
if (this._strengthChangedId > 0) {
this._activeAccessPoint.disconnect(this._strengthChangedId);
this._strengthChangedId = 0;
}
if (this._wirelessEnabledChangedId) {
this._client.disconnect(this._wirelessEnabledChangedId);
this._wirelessEnabledChangedId = 0;
}
if (this._wirelessHwEnabledChangedId) {
this._client.disconnect(this._wirelessHwEnabledChangedId);
this._wirelessHwEnabledChangedId = 0;
}
if (this._dialog) { if (this._dialog) {
this._dialog.destroy(); this._dialog.destroy();
this._dialog = null; this._dialog = null;
} }
if (this._notifyConnectivityId) {
this._client.disconnect(this._notifyConnectivityId);
this._notifyConnectivityId = 0;
}
this.item.destroy(); this.item.destroy();
} }
@ -1395,17 +1327,12 @@ var NMDeviceWireless = class {
} }
_activeApChanged() { _activeApChanged() {
if (this._activeAccessPoint) { this._activeAccessPoint?.disconnectObject(this);
this._activeAccessPoint.disconnect(this._strengthChangedId);
this._strengthChangedId = 0;
}
this._activeAccessPoint = this._device.active_access_point; this._activeAccessPoint = this._device.active_access_point;
if (this._activeAccessPoint) { this._activeAccessPoint?.connectObject('notify::strength',
this._strengthChangedId = this._activeAccessPoint.connect('notify::strength', this._strengthChanged.bind(this), this);
this._strengthChanged.bind(this));
}
this._sync(); this._sync();
} }
@ -1568,17 +1495,12 @@ var NMVpnConnectionItem = class extends NMConnectionItem {
} }
setActiveConnection(activeConnection) { setActiveConnection(activeConnection) {
if (this._activeConnectionChangedId > 0) { this._activeConnection?.disconnectObject(this);
this._activeConnection.disconnect(this._activeConnectionChangedId);
this._activeConnectionChangedId = 0;
}
this._activeConnection = activeConnection; this._activeConnection = activeConnection;
if (this._activeConnection) { this._activeConnection?.connectObject('vpn-state-changed',
this._activeConnectionChangedId = this._activeConnection.connect('vpn-state-changed', this._connectionStateChanged.bind(this), this);
this._connectionStateChanged.bind(this));
}
this._sync(); this._sync();
} }
@ -1766,8 +1688,6 @@ class Indicator extends PanelMenu.SystemIndicator {
this._connectivityQueue = []; this._connectivityQueue = [];
this._mainConnection = null; this._mainConnection = null;
this._mainConnectionIconChangedId = 0;
this._mainConnectionStateChangedId = 0;
this._notification = null; this._notification = null;
@ -1919,8 +1839,8 @@ class Indicator extends PanelMenu.SystemIndicator {
} }
_addDeviceWrapper(wrapper) { _addDeviceWrapper(wrapper) {
wrapper._activationFailedId = wrapper.connect('activation-failed', wrapper.connectObject('activation-failed',
this._onActivationFailed.bind(this)); this._onActivationFailed.bind(this), this);
let section = this._devices[wrapper.category].section; let section = this._devices[wrapper.category].section;
section.addMenuItem(wrapper.item); section.addMenuItem(wrapper.item);
@ -1946,7 +1866,7 @@ class Indicator extends PanelMenu.SystemIndicator {
} }
_removeDeviceWrapper(wrapper) { _removeDeviceWrapper(wrapper) {
wrapper.disconnect(wrapper._activationFailedId); wrapper.disconnectObject(this);
wrapper.destroy(); wrapper.destroy();
let devices = this._devices[wrapper.category].devices; let devices = this._devices[wrapper.category].devices;
@ -1973,22 +1893,16 @@ class Indicator extends PanelMenu.SystemIndicator {
} }
_syncMainConnection() { _syncMainConnection() {
if (this._mainConnectionIconChangedId > 0) { this._mainConnection?._primaryDevice?.disconnectObject(this);
this._mainConnection._primaryDevice.disconnect(this._mainConnectionIconChangedId); this._mainConnection?.disconnectObject(this);
this._mainConnectionIconChangedId = 0;
}
if (this._mainConnectionStateChangedId > 0) {
this._mainConnection.disconnect(this._mainConnectionStateChangedId);
this._mainConnectionStateChangedId = 0;
}
this._mainConnection = this._getMainConnection(); this._mainConnection = this._getMainConnection();
if (this._mainConnection) { if (this._mainConnection) {
if (this._mainConnection._primaryDevice) this._mainConnection._primaryDevice?.connectObject('icon-changed',
this._mainConnectionIconChangedId = this._mainConnection._primaryDevice.connect('icon-changed', this._updateIcon.bind(this)); this._updateIcon.bind(this), this);
this._mainConnectionStateChangedId = this._mainConnection.connect('notify::state', this._mainConnectionStateChanged.bind(this)); this._mainConnection.connectObject('notify::state',
this._mainConnectionStateChanged.bind(this), this);
this._mainConnectionStateChanged(); this._mainConnectionStateChanged();
} }
@ -2028,12 +1942,13 @@ class Indicator extends PanelMenu.SystemIndicator {
_addConnection(connection) { _addConnection(connection) {
if (this._ignoreConnection(connection)) if (this._ignoreConnection(connection))
return; return;
if (connection._updatedId) { if (this._connections.includes(connection)) {
// connection was already seen // connection was already seen
return; return;
} }
connection._updatedId = connection.connect('changed', this._updateConnection.bind(this)); connection.connectObject('changed',
this._updateConnection.bind(this), this);
this._updateConnection(connection); this._updateConnection(connection);
this._connections.push(connection); this._connections.push(connection);
@ -2068,8 +1983,7 @@ class Indicator extends PanelMenu.SystemIndicator {
} }
} }
connection.disconnect(connection._updatedId); connection.disconnectObject(this);
connection._updatedId = 0;
} }
_updateConnection(connection) { _updateConnection(connection) {

5
js/ui/status/thunderbolt.js
View File

@ -71,7 +71,8 @@ var Client = class {
log(`error creating bolt proxy: ${e.message}`); log(`error creating bolt proxy: ${e.message}`);
return; return;
} }
this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this)); this._proxy.connectObject('g-properties-changed',
this._onPropertiesChanged.bind(this), this);
this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this)); this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this));
this.probing = this._proxy.Probing; this.probing = this._proxy.Probing;
@ -102,7 +103,7 @@ var Client = class {
return; return;
this._proxy.disconnectSignal(this._deviceAddedId); this._proxy.disconnectSignal(this._deviceAddedId);
this._proxy.disconnect(this._propsChangedId); this._proxy.disconnectObject(this);
this._proxy = null; this._proxy = null;
} }

19
js/ui/status/volume.js
View File

@ -91,15 +91,13 @@ var StreamSlider = class {
} }
_disconnectStream(stream) { _disconnectStream(stream) {
stream.disconnect(this._mutedChangedId); stream.disconnectObject(this);
this._mutedChangedId = 0;
stream.disconnect(this._volumeChangedId);
this._volumeChangedId = 0;
} }
_connectStream(stream) { _connectStream(stream) {
this._mutedChangedId = stream.connect('notify::is-muted', this._updateVolume.bind(this)); stream.connectObject(
this._volumeChangedId = stream.connect('notify::volume', this._updateVolume.bind(this)); 'notify::is-muted', this._updateVolume.bind(this),
'notify::volume', this._updateVolume.bind(this), this);
} }
_shouldBeVisible() { _shouldBeVisible() {
@ -231,7 +229,8 @@ var OutputStreamSlider = class extends StreamSlider {
_connectStream(stream) { _connectStream(stream) {
super._connectStream(stream); super._connectStream(stream);
this._portChangedId = stream.connect('notify::port', this._portChanged.bind(this)); stream.connectObject('notify::port',
this._portChanged.bind(this), this);
this._portChanged(); this._portChanged();
} }
@ -250,12 +249,6 @@ var OutputStreamSlider = class extends StreamSlider {
return false; return false;
} }
_disconnectStream(stream) {
super._disconnectStream(stream);
stream.disconnect(this._portChangedId);
this._portChangedId = 0;
}
_updateSliderIcon() { _updateSliderIcon() {
this._icon.icon_name = this._hasHeadphones this._icon.icon_name = this._hasHeadphones
? 'audio-headphones-symbolic' ? 'audio-headphones-symbolic'

9
js/ui/swipeTracker.js
View File

@ -112,8 +112,8 @@ const TouchpadSwipeGesture = GObject.registerClass({
schema_id: 'org.gnome.desktop.peripherals.touchpad', schema_id: 'org.gnome.desktop.peripherals.touchpad',
}); });
this._stageCaptureEvent = global.stage.connectObject(
global.stage.connect('captured-event::touchpad', this._handleEvent.bind(this)); 'captured-event::touchpad', this._handleEvent.bind(this), this);
} }
_handleEvent(actor, event) { _handleEvent(actor, event) {
@ -203,10 +203,7 @@ const TouchpadSwipeGesture = GObject.registerClass({
} }
destroy() { destroy() {
if (this._stageCaptureEvent) { global.stage.disconnectObject(this);
global.stage.disconnect(this._stageCaptureEvent);
delete this._stageCaptureEvent;
}
} }
}); });

6
js/ui/switcherPopup.js
View File

@ -48,8 +48,8 @@ var SwitcherPopup = GObject.registerClass({
Main.uiGroup.add_actor(this); Main.uiGroup.add_actor(this);
this._systemModalOpenedId = Main.layoutManager.connectObject(
Main.layoutManager.connect('system-modal-opened', () => this.destroy()); 'system-modal-opened', () => this.destroy(), this);
this._haveModal = false; this._haveModal = false;
this._modifierMask = 0; this._modifierMask = 0;
@ -337,8 +337,6 @@ var SwitcherPopup = GObject.registerClass({
_onDestroy() { _onDestroy() {
this._popModal(); this._popModal();
Main.layoutManager.disconnect(this._systemModalOpenedId);
if (this._motionTimeoutId != 0) if (this._motionTimeoutId != 0)
GLib.source_remove(this._motionTimeoutId); GLib.source_remove(this._motionTimeoutId);
if (this._initialDelayTimeoutId != 0) if (this._initialDelayTimeoutId != 0)

83
js/ui/unlockDialog.js
View File

@ -58,17 +58,13 @@ var NotificationsBox = GObject.registerClass({
}); });
this._updateVisibility(); this._updateVisibility();
this._sourceAddedId = Main.messageTray.connect('source-added', this._sourceAdded.bind(this)); Main.messageTray.connectObject('source-added',
this._sourceAdded.bind(this), this);
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }
_onDestroy() { _onDestroy() {
if (this._sourceAddedId) {
Main.messageTray.disconnect(this._sourceAddedId);
this._sourceAddedId = 0;
}
let items = this._sources.entries(); let items = this._sources.entries();
for (let [source, obj] of items) for (let [source, obj] of items)
this._removeSource(source, obj); this._removeSource(source, obj);
@ -194,10 +190,6 @@ var NotificationsBox = GObject.registerClass({
let obj = { let obj = {
visible: source.policy.showInLockScreen, visible: source.policy.showInLockScreen,
detailed: this._shouldShowDetails(source), detailed: this._shouldShowDetails(source),
sourceDestroyId: 0,
sourceCountChangedId: 0,
sourceTitleChangedId: 0,
sourceUpdatedId: 0,
sourceBox: null, sourceBox: null,
titleLabel: null, titleLabel: null,
countLabel: null, countLabel: null,
@ -211,21 +203,19 @@ var NotificationsBox = GObject.registerClass({
this._showSource(source, obj, obj.sourceBox); this._showSource(source, obj, obj.sourceBox);
this._notificationBox.add_child(obj.sourceBox); this._notificationBox.add_child(obj.sourceBox);
obj.sourceCountChangedId = source.connect('notify::count', () => { source.connectObject(
this._countChanged(source, obj); 'notify::count', () => this._countChanged(source, obj),
}); 'notify::title', () => this._titleChanged(source, obj),
obj.sourceTitleChangedId = source.connect('notify::title', () => { 'destroy', () => {
this._titleChanged(source, obj); this._removeSource(source, obj);
}); this._updateVisibility();
}, this);
obj.policyChangedId = source.policy.connect('notify', (policy, pspec) => { obj.policyChangedId = source.policy.connect('notify', (policy, pspec) => {
if (pspec.name === 'show-in-lock-screen') if (pspec.name === 'show-in-lock-screen')
this._visibleChanged(source, obj); this._visibleChanged(source, obj);
else else
this._detailedChanged(source, obj); this._detailedChanged(source, obj);
}); });
obj.sourceDestroyId = source.connect('destroy', () => {
this._onSourceDestroy(source, obj);
});
this._sources.set(source, obj); this._sources.set(source, obj);
@ -307,18 +297,10 @@ var NotificationsBox = GObject.registerClass({
this._showSource(source, obj, obj.sourceBox); this._showSource(source, obj, obj.sourceBox);
} }
_onSourceDestroy(source, obj) {
this._removeSource(source, obj);
this._updateVisibility();
}
_removeSource(source, obj) { _removeSource(source, obj) {
obj.sourceBox.destroy(); obj.sourceBox.destroy();
obj.sourceBox = obj.titleLabel = obj.countLabel = null; obj.sourceBox = obj.titleLabel = obj.countLabel = null;
source.disconnect(obj.sourceDestroyId);
source.disconnect(obj.sourceCountChangedId);
source.disconnect(obj.sourceTitleChangedId);
source.policy.disconnect(obj.policyChangedId); source.policy.disconnect(obj.policyChangedId);
this._sources.delete(source); this._sources.delete(source);
@ -352,12 +334,12 @@ class UnlockDialogClock extends St.BoxLayout {
this._wallClock.connect('notify::clock', this._updateClock.bind(this)); this._wallClock.connect('notify::clock', this._updateClock.bind(this));
this._seat = Clutter.get_default_backend().get_default_seat(); this._seat = Clutter.get_default_backend().get_default_seat();
this._touchModeChangedId = this._seat.connect('notify::touch-mode', this._seat.connectObject('notify::touch-mode',
this._updateHint.bind(this)); this._updateHint.bind(this), this);
this._monitorManager = Meta.MonitorManager.get(); this._monitorManager = Meta.MonitorManager.get();
this._powerModeChangedId = this._monitorManager.connect( this._monitorManager.connectObject('power-save-mode-changed',
'power-save-mode-changed', () => (this._hint.opacity = 0)); () => (this._hint.opacity = 0), this);
this._idleMonitor = global.backend.get_core_idle_monitor(); 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, () => {
@ -392,9 +374,7 @@ class UnlockDialogClock extends St.BoxLayout {
_onDestroy() { _onDestroy() {
this._wallClock.run_dispose(); this._wallClock.run_dispose();
this._seat.disconnect(this._touchModeChangedId);
this._idleMonitor.remove_watch(this._idleWatchId); this._idleMonitor.remove_watch(this._idleWatchId);
this._monitorManager.disconnect(this._powerModeChangedId);
} }
}); });
@ -545,12 +525,12 @@ var UnlockDialog = GObject.registerClass({
this._bgManagers = []; this._bgManagers = [];
const themeContext = St.ThemeContext.get_for_stage(global.stage); const themeContext = St.ThemeContext.get_for_stage(global.stage);
this._scaleChangedId = themeContext.connect('notify::scale-factor', themeContext.connectObject('notify::scale-factor',
() => this._updateBackgroundEffects()); () => this._updateBackgroundEffects(), this);
this._updateBackgrounds(); this._updateBackgrounds();
this._monitorsChangedId = Main.layoutManager.connectObject('monitors-changed',
Main.layoutManager.connect('monitors-changed', this._updateBackgrounds.bind(this)); this._updateBackgrounds.bind(this), this);
this._userManager = AccountsService.UserManager.get_default(); this._userManager = AccountsService.UserManager.get_default();
this._userName = GLib.get_user_name(); this._userName = GLib.get_user_name();
@ -593,15 +573,15 @@ var UnlockDialog = GObject.registerClass({
this._screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' }); this._screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
this._userSwitchEnabledId = this._screenSaverSettings.connect('changed::user-switch-enabled', this._screenSaverSettings.connectObject('changed::user-switch-enabled',
this._updateUserSwitchVisibility.bind(this)); this._updateUserSwitchVisibility.bind(this), this);
this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' }); this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' });
this._lockdownSettings.connect('changed::disable-user-switching', this._lockdownSettings.connect('changed::disable-user-switching',
this._updateUserSwitchVisibility.bind(this)); this._updateUserSwitchVisibility.bind(this));
this._userLoadedId = this._user.connect('notify::is-loaded', this._user.connectObject('notify::is-loaded',
this._updateUserSwitchVisibility.bind(this)); this._updateUserSwitchVisibility.bind(this), this);
this._updateUserSwitchVisibility(); this._updateUserSwitchVisibility();
@ -850,31 +830,10 @@ var UnlockDialog = GObject.registerClass({
this._idleWatchId = 0; this._idleWatchId = 0;
} }
if (this._monitorsChangedId) {
Main.layoutManager.disconnect(this._monitorsChangedId);
delete this._monitorsChangedId;
}
let themeContext = St.ThemeContext.get_for_stage(global.stage);
if (this._scaleChangedId) {
themeContext.disconnect(this._scaleChangedId);
delete this._scaleChangedId;
}
if (this._gdmClient) { if (this._gdmClient) {
this._gdmClient = null; this._gdmClient = null;
delete this._gdmClient; delete this._gdmClient;
} }
if (this._userLoadedId) {
this._user.disconnect(this._userLoadedId);
this._userLoadedId = 0;
}
if (this._userSwitchEnabledId) {
this._screenSaverSettings.disconnect(this._userSwitchEnabledId);
this._userSwitchEnabledId = 0;
}
} }
_updateUserSwitchVisibility() { _updateUserSwitchVisibility() {

56
js/ui/userWidget.js
View File

@ -40,10 +40,7 @@ class Avatar extends St.Bin {
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
// Monitor the scaling factor to make sure we recreate the avatar when needed. // Monitor the scaling factor to make sure we recreate the avatar when needed.
this._scaleFactorChangeId = themeContext.connectObject('notify::scale-factor', this.update.bind(this), this);
themeContext.connect('notify::scale-factor', this.update.bind(this));
this.connect('destroy', this._onDestroy.bind(this));
} }
vfunc_style_changed() { vfunc_style_changed() {
@ -63,14 +60,6 @@ class Avatar extends St.Bin {
this.update(); this.update();
} }
_onDestroy() {
if (this._scaleFactorChangeId) {
let themeContext = St.ThemeContext.get_for_stage(global.stage);
themeContext.disconnect(this._scaleFactorChangeId);
delete this._scaleFactorChangeId;
}
}
setSensitive(sensitive) { setSensitive(sensitive) {
this.reactive = sensitive; this.reactive = sensitive;
} }
@ -125,28 +114,10 @@ class UserWidgetLabel extends St.Widget {
this._currentLabel = null; this._currentLabel = null;
this._userLoadedId = this._user.connect('notify::is-loaded', this._updateUser.bind(this)); this._user.connectObject(
this._userChangedId = this._user.connect('changed', this._updateUser.bind(this)); 'notify::is-loaded', this._updateUser.bind(this),
'changed', this._updateUser.bind(this), this);
this._updateUser(); this._updateUser();
// We can't override the destroy vfunc because that might be called during
// object finalization, and we can't call any JS inside a GC finalize callback,
// so we use a signal, that will be disconnected by GObject the first time
// the actor is destroyed (which is guaranteed to be as part of a normal
// destroy() call from JS, possibly from some ancestor)
this.connect('destroy', this._onDestroy.bind(this));
}
_onDestroy() {
if (this._userLoadedId != 0) {
this._user.disconnect(this._userLoadedId);
this._userLoadedId = 0;
}
if (this._userChangedId != 0) {
this._user.disconnect(this._userChangedId);
this._userChangedId = 0;
}
} }
vfunc_allocate(box) { vfunc_allocate(box) {
@ -207,8 +178,6 @@ class UserWidget extends St.BoxLayout {
xAlign, xAlign,
}); });
this.connect('destroy', this._onDestroy.bind(this));
this._avatar = new Avatar(user); this._avatar = new Avatar(user);
this._avatar.x_align = Clutter.ActorAlign.CENTER; this._avatar.x_align = Clutter.ActorAlign.CENTER;
this.add_child(this._avatar); this.add_child(this._avatar);
@ -222,8 +191,9 @@ class UserWidget extends St.BoxLayout {
this._label.bind_property('label-actor', this, 'label-actor', this._label.bind_property('label-actor', this, 'label-actor',
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
this._userLoadedId = this._user.connect('notify::is-loaded', this._updateUser.bind(this)); this._user.connectObject(
this._userChangedId = this._user.connect('changed', this._updateUser.bind(this)); 'notify::is-loaded', this._updateUser.bind(this),
'changed', this._updateUser.bind(this), this);
} else { } else {
this._label = new St.Label({ this._label = new St.Label({
style_class: 'user-widget-label', style_class: 'user-widget-label',
@ -236,18 +206,6 @@ class UserWidget extends St.BoxLayout {
this._updateUser(); this._updateUser();
} }
_onDestroy() {
if (this._userLoadedId != 0) {
this._user.disconnect(this._userLoadedId);
this._userLoadedId = 0;
}
if (this._userChangedId != 0) {
this._user.disconnect(this._userChangedId);
this._userChangedId = 0;
}
}
_updateUser() { _updateUser() {
this._avatar.update(); this._avatar.update();
} }

30
js/ui/windowAttentionHandler.js
View File

@ -9,10 +9,10 @@ const MessageTray = imports.ui.messageTray;
var WindowAttentionHandler = class { var WindowAttentionHandler = class {
constructor() { constructor() {
this._tracker = Shell.WindowTracker.get_default(); this._tracker = Shell.WindowTracker.get_default();
this._windowDemandsAttentionId = global.display.connect('window-demands-attention', global.display.connectObject(
this._onWindowDemandsAttention.bind(this)); 'window-demands-attention', this._onWindowDemandsAttention.bind(this),
this._windowMarkedUrgentId = global.display.connect('window-marked-urgent', 'window-marked-urgent', this._onWindowDemandsAttention.bind(this),
this._onWindowDemandsAttention.bind(this)); this);
} }
_getTitleAndBanner(app, window) { _getTitleAndBanner(app, window) {
@ -47,10 +47,10 @@ var WindowAttentionHandler = class {
source.showNotification(notification); source.showNotification(notification);
source.signalIDs.push(window.connect('notify::title', () => { window.connectObject('notify::title', () => {
[title, banner] = this._getTitleAndBanner(app, window); [title, banner] = this._getTitleAndBanner(app, window);
notification.update(title, banner); notification.update(title, banner);
})); }, source);
} }
}; };
@ -62,15 +62,11 @@ class WindowAttentionSource extends MessageTray.Source {
super._init(app.get_name()); super._init(app.get_name());
this.signalIDs = []; this._window.connectObject(
this.signalIDs.push(this._window.connect('notify::demands-attention', 'notify::demands-attention', this._sync.bind(this),
this._sync.bind(this))); 'notify::urgent', this._sync.bind(this),
this.signalIDs.push(this._window.connect('notify::urgent', 'focus', () => this.destroy(),
this._sync.bind(this))); 'unmanaged', () => this.destroy(), this);
this.signalIDs.push(this._window.connect('focus',
() => this.destroy()));
this.signalIDs.push(this._window.connect('unmanaged',
() => this.destroy()));
} }
_sync() { _sync() {
@ -93,9 +89,7 @@ class WindowAttentionSource extends MessageTray.Source {
} }
destroy(params) { destroy(params) {
for (let i = 0; i < this.signalIDs.length; i++) this._window.disconnectObject(this);
this._window.disconnect(this.signalIDs[i]);
this.signalIDs = [];
super.destroy(params); super.destroy(params);
} }

43
js/ui/windowManager.js
View File

@ -356,9 +356,9 @@ var WorkspaceTracker = class {
this._workspaces[w] = workspaceManager.get_workspace_by_index(w); this._workspaces[w] = workspaceManager.get_workspace_by_index(w);
for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) { for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
let workspace = this._workspaces[w]; this._workspaces[w].connectObject(
workspace._windowAddedId = workspace.connect('window-added', this._queueCheckWorkspaces.bind(this)); 'window-added', this._queueCheckWorkspaces.bind(this),
workspace._windowRemovedId = workspace.connect('window-removed', this._windowRemoved.bind(this)); 'window-removed', this._windowRemoved.bind(this), this);
} }
} else { } else {
// Assume workspaces are only removed sequentially // Assume workspaces are only removed sequentially
@ -374,10 +374,7 @@ var WorkspaceTracker = class {
} }
let lostWorkspaces = this._workspaces.splice(removedIndex, removedNum); let lostWorkspaces = this._workspaces.splice(removedIndex, removedNum);
lostWorkspaces.forEach(workspace => { lostWorkspaces.forEach(workspace => workspace.disconnectObject(this));
workspace.disconnect(workspace._windowAddedId);
workspace.disconnect(workspace._windowRemovedId);
});
} }
this._queueCheckWorkspaces(); this._queueCheckWorkspaces();
@ -1307,16 +1304,14 @@ var WindowManager = class {
this._shellwm.completed_size_change(actor); this._shellwm.completed_size_change(actor);
} }
let destroyId = actor.connect('destroy', () => { actor.connectObject('destroy',
this._clearAnimationInfo(actor); () => this._clearAnimationInfo(actor), actorClone);
});
this._resizePending.add(actor); this._resizePending.add(actor);
actor.__animationInfo = { actor.__animationInfo = {
clone: actorClone, clone: actorClone,
oldRect: oldFrameRect, oldRect: oldFrameRect,
frozen: true, frozen: true,
destroyId,
}; };
} }
@ -1381,7 +1376,6 @@ var WindowManager = class {
_clearAnimationInfo(actor) { _clearAnimationInfo(actor) {
if (actor.__animationInfo) { if (actor.__animationInfo) {
actor.__animationInfo.clone.destroy(); actor.__animationInfo.clone.destroy();
actor.disconnect(actor.__animationInfo.destroyId);
if (actor.__animationInfo.frozen) if (actor.__animationInfo.frozen)
actor.thaw(); actor.thaw();
@ -1457,20 +1451,19 @@ var WindowManager = class {
async _mapWindow(shellwm, actor) { async _mapWindow(shellwm, actor) {
actor._windowType = actor.meta_window.get_window_type(); actor._windowType = actor.meta_window.get_window_type();
actor._notifyWindowTypeSignalId = actor.meta_window.connectObject('notify::window-type', () => {
actor.meta_window.connect('notify::window-type', () => {
let type = actor.meta_window.get_window_type(); let type = actor.meta_window.get_window_type();
if (type == actor._windowType) if (type === actor._windowType)
return; return;
if (type == Meta.WindowType.MODAL_DIALOG || if (type === Meta.WindowType.MODAL_DIALOG ||
actor._windowType == Meta.WindowType.MODAL_DIALOG) { actor._windowType === Meta.WindowType.MODAL_DIALOG) {
let parent = actor.get_meta_window().get_transient_for(); let parent = actor.get_meta_window().get_transient_for();
if (parent) if (parent)
this._checkDimming(parent); this._checkDimming(parent);
} }
actor._windowType = type; actor._windowType = type;
}); }, actor);
actor.meta_window.connect('unmanaged', window => { actor.meta_window.connect('unmanaged', window => {
let parent = window.get_transient_for(); let parent = window.get_transient_for();
if (parent) if (parent)
@ -1547,10 +1540,7 @@ var WindowManager = class {
_destroyWindow(shellwm, actor) { _destroyWindow(shellwm, actor) {
let window = actor.meta_window; let window = actor.meta_window;
if (actor._notifyWindowTypeSignalId) { window.disconnectObject(actor);
window.disconnect(actor._notifyWindowTypeSignalId);
actor._notifyWindowTypeSignalId = 0;
}
if (window._dimmed) { if (window._dimmed) {
this._dimmedWindows = this._dimmedWindows =
this._dimmedWindows.filter(win => win != window); this._dimmedWindows.filter(win => win != window);
@ -1590,10 +1580,10 @@ var WindowManager = class {
if (window.is_attached_dialog()) { if (window.is_attached_dialog()) {
let parent = window.get_transient_for(); let parent = window.get_transient_for();
actor._parentDestroyId = parent.connect('unmanaged', () => { parent.connectObject('unmanaged', () => {
actor.remove_all_transitions(); actor.remove_all_transitions();
this._destroyWindowDone(shellwm, actor); this._destroyWindowDone(shellwm, actor);
}); }, actor);
} }
actor.ease({ actor.ease({
@ -1611,10 +1601,7 @@ var WindowManager = class {
_destroyWindowDone(shellwm, actor) { _destroyWindowDone(shellwm, actor) {
if (this._destroying.delete(actor)) { if (this._destroying.delete(actor)) {
const parent = actor.get_meta_window()?.get_transient_for(); const parent = actor.get_meta_window()?.get_transient_for();
if (parent && actor._parentDestroyId) { parent?.disconnectObject(actor);
parent.disconnect(actor._parentDestroyId);
actor._parentDestroyId = 0;
}
shellwm.completed_destroy(actor); shellwm.completed_destroy(actor);
} }
} }

24
js/ui/windowPreview.js
View File

@ -94,8 +94,7 @@ var WindowPreview = GObject.registerClass({
this.emit('size-changed'); this.emit('size-changed');
}); });
this._windowDestroyId = this._windowActor.connectObject('destroy', () => this.destroy(), this);
this._windowActor.connect('destroy', () => this.destroy());
this._updateAttachedDialogs(); this._updateAttachedDialogs();
@ -177,9 +176,9 @@ var WindowPreview = GObject.registerClass({
})); }));
this._title.clutter_text.ellipsize = Pango.EllipsizeMode.END; this._title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
this.label_actor = this._title; this.label_actor = this._title;
this._updateCaptionId = this.metaWindow.connect('notify::title', () => { this.metaWindow.connectObject(
this._title.text = this._getCaption(); 'notify::title', () => (this._title.text = this._getCaption()),
}); this);
const layout = Meta.prefs_get_button_layout(); const layout = Meta.prefs_get_button_layout();
this._closeButtonSide = this._closeButtonSide =
@ -213,10 +212,8 @@ var WindowPreview = GObject.registerClass({
this.add_child(this._icon); this.add_child(this._icon);
this.add_child(this._closeButton); this.add_child(this._closeButton);
this._adjustmentChangedId = this._overviewAdjustment.connectObject(
this._overviewAdjustment.connect('notify::value', () => { 'notify::value', () => this._updateIconScale(), this);
this._updateIconScale();
});
this._updateIconScale(); this._updateIconScale();
this.connect('notify::realized', () => { this.connect('notify::realized', () => {
@ -526,13 +523,9 @@ var WindowPreview = GObject.registerClass({
} }
_onDestroy() { _onDestroy() {
this._windowActor.disconnect(this._windowDestroyId);
this.metaWindow._delegate = null; this.metaWindow._delegate = null;
this._delegate = null; this._delegate = null;
this.metaWindow.disconnect(this._updateCaptionId);
if (this._longPressLater) { if (this._longPressLater) {
Meta.later_remove(this._longPressLater); Meta.later_remove(this._longPressLater);
delete this._longPressLater; delete this._longPressLater;
@ -543,11 +536,6 @@ var WindowPreview = GObject.registerClass({
this._idleHideOverlayId = 0; this._idleHideOverlayId = 0;
} }
if (this._adjustmentChangedId > 0) {
this._overviewAdjustment.disconnect(this._adjustmentChangedId);
this._adjustmentChangedId = 0;
}
if (this.inDrag) { if (this.inDrag) {
this.emit('drag-end'); this.emit('drag-end');
this.inDrag = false; this.inDrag = false;

57
js/ui/workspace.js
View File

@ -941,10 +941,10 @@ class WorkspaceBackground extends St.Widget {
this._workarea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex); this._workarea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
this._stateAdjustment = stateAdjustment; this._stateAdjustment = stateAdjustment;
this._adjustmentId = stateAdjustment.connect('notify::value', () => { this._stateAdjustment.connectObject('notify::value', () => {
this._updateBorderRadius(); this._updateBorderRadius();
this.queue_relayout(); this.queue_relayout();
}); }, this);
this._bin = new Clutter.Actor({ this._bin = new Clutter.Actor({
layout_manager: new Clutter.BinLayout(), layout_manager: new Clutter.BinLayout(),
@ -966,12 +966,11 @@ class WorkspaceBackground extends St.Widget {
useContentSize: false, useContentSize: false,
}); });
this._workareasChangedId = global.display.connectObject('workareas-changed', () => {
global.display.connect('workareas-changed', () => {
this._workarea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex); this._workarea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
this._updateRoundedClipBounds(); this._updateRoundedClipBounds();
this.queue_relayout(); this.queue_relayout();
}); }, this);
this._updateRoundedClipBounds(); this._updateRoundedClipBounds();
this._updateBorderRadius(); this._updateBorderRadius();
@ -1051,16 +1050,6 @@ class WorkspaceBackground extends St.Widget {
this._bgManager.destroy(); this._bgManager.destroy();
this._bgManager = null; this._bgManager = null;
} }
if (this._workareasChangedId) {
global.display.disconnect(this._workareasChangedId);
delete this._workareasChangedId;
}
if (this._adjustmentId) {
this._stateAdjustment.disconnect(this._adjustmentId);
delete this._adjustmentId;
}
} }
}); });
@ -1094,10 +1083,6 @@ class Workspace extends St.Widget {
this.add_child(this._container); this.add_child(this._container);
this.metaWorkspace = metaWorkspace; this.metaWorkspace = metaWorkspace;
this._activeWorkspaceChangedId =
this.metaWorkspace?.connect('notify::active', () => {
layoutManager.syncOverlays();
});
this._overviewAdjustment = overviewAdjustment; this._overviewAdjustment = overviewAdjustment;
@ -1138,16 +1123,14 @@ class Workspace extends St.Widget {
} }
// Track window changes, but let the window tracker process them first // Track window changes, but let the window tracker process them first
if (this.metaWorkspace) { this.metaWorkspace?.connectObject(
this._windowAddedId = this.metaWorkspace.connect_after( 'window-added', this._windowAdded.bind(this), GObject.ConnectFlags.AFTER,
'window-added', this._windowAdded.bind(this)); 'window-removed', this._windowRemoved.bind(this), GObject.ConnectFlags.AFTER,
this._windowRemovedId = this.metaWorkspace.connect_after( 'notify::active', () => layoutManager.syncOverlays(), this);
'window-removed', this._windowRemoved.bind(this)); global.display.connectObject(
} 'window-entered-monitor', this._windowEnteredMonitor.bind(this), GObject.ConnectFlags.AFTER,
this._windowEnteredMonitorId = global.display.connect_after( 'window-left-monitor', this._windowLeftMonitor.bind(this), GObject.ConnectFlags.AFTER,
'window-entered-monitor', this._windowEnteredMonitor.bind(this)); this);
this._windowLeftMonitorId = global.display.connect_after(
'window-left-monitor', this._windowLeftMonitor.bind(this));
this._layoutFrozenId = 0; this._layoutFrozenId = 0;
// DND requires this to be set // DND requires this to be set
@ -1347,25 +1330,13 @@ class Workspace extends St.Widget {
} }
this._container.layout_manager.layout_frozen = true; this._container.layout_manager.layout_frozen = true;
this._overviewHiddenId = Main.overview.connect('hidden', this._doneLeavingOverview.bind(this)); Main.overview.connectObject(
'hidden', this._doneLeavingOverview.bind(this), this);
} }
_onDestroy() { _onDestroy() {
this._clearSkipTaskbarSignals(); this._clearSkipTaskbarSignals();
if (this._overviewHiddenId) {
Main.overview.disconnect(this._overviewHiddenId);
this._overviewHiddenId = 0;
}
if (this.metaWorkspace) {
this.metaWorkspace.disconnect(this._windowAddedId);
this.metaWorkspace.disconnect(this._windowRemovedId);
this.metaWorkspace.disconnect(this._activeWorkspaceChangedId);
}
global.display.disconnect(this._windowEnteredMonitorId);
global.display.disconnect(this._windowLeftMonitorId);
if (this._layoutFrozenId > 0) { if (this._layoutFrozenId > 0) {
GLib.source_remove(this._layoutFrozenId); GLib.source_remove(this._layoutFrozenId);
this._layoutFrozenId = 0; this._layoutFrozenId = 0;

13
js/ui/workspaceAnimation.js
View File

@ -40,8 +40,8 @@ class WorkspaceGroup extends Clutter.Actor {
this._createWindows(); this._createWindows();
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
this._restackedId = global.display.connect('restacked', global.display.connectObject('restacked',
this._syncStacking.bind(this)); this._syncStacking.bind(this), this);
} }
get workspace() { get workspace() {
@ -99,26 +99,23 @@ class WorkspaceGroup extends Clutter.Actor {
const record = { windowActor, clone }; const record = { windowActor, clone };
record.windowDestroyId = windowActor.connect('destroy', () => { windowActor.connectObject('destroy', () => {
clone.destroy(); clone.destroy();
this._windowRecords.splice(this._windowRecords.indexOf(record), 1); this._windowRecords.splice(this._windowRecords.indexOf(record), 1);
}); }, this);
this._windowRecords.push(record); this._windowRecords.push(record);
} }
} }
_removeWindows() { _removeWindows() {
for (const record of this._windowRecords) { for (const record of this._windowRecords)
record.windowActor.disconnect(record.windowDestroyId);
record.clone.destroy(); record.clone.destroy();
}
this._windowRecords = []; this._windowRecords = [];
} }
_onDestroy() { _onDestroy() {
global.display.disconnect(this._restackedId);
this._removeWindows(); this._removeWindows();
if (this._workspace) if (this._workspace)

14
js/ui/workspaceSwitcherPopup.js
View File

@ -38,11 +38,9 @@ class WorkspaceSwitcherPopup extends Clutter.Actor {
this.hide(); this.hide();
let workspaceManager = global.workspace_manager; let workspaceManager = global.workspace_manager;
this._workspaceManagerSignals = []; workspaceManager.connectObject(
this._workspaceManagerSignals.push(workspaceManager.connect('workspace-added', 'workspace-added', this._redisplay.bind(this),
this._redisplay.bind(this))); 'workspace-removed', this._redisplay.bind(this), this);
this._workspaceManagerSignals.push(workspaceManager.connect('workspace-removed',
this._redisplay.bind(this)));
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }
@ -99,11 +97,5 @@ class WorkspaceSwitcherPopup extends Clutter.Actor {
if (this._timeoutId) if (this._timeoutId)
GLib.source_remove(this._timeoutId); GLib.source_remove(this._timeoutId);
this._timeoutId = 0; this._timeoutId = 0;
let workspaceManager = global.workspace_manager;
for (let i = 0; i < this._workspaceManagerSignals.length; i++)
workspaceManager.disconnect(this._workspaceManagerSignals[i]);
this._workspaceManagerSignals = [];
} }
}); });

165
js/ui/workspaceThumbnail.js
View File

@ -64,14 +64,14 @@ var WindowClone = GObject.registerClass({
this.realWindow = realWindow; this.realWindow = realWindow;
this.metaWindow = realWindow.meta_window; this.metaWindow = realWindow.meta_window;
clone._updateId = this.realWindow.connect('notify::position', this.realWindow.connectObject(
this._onPositionChanged.bind(this)); 'notify::position', this._onPositionChanged.bind(this),
clone._destroyId = this.realWindow.connect('destroy', () => { 'destroy', () => {
// First destroy the clone and then destroy everything // First destroy the clone and then destroy everything
// This will ensure that we never see it in the _disconnectSignals loop // This will ensure that we never see it in the _disconnectSignals loop
clone.destroy(); clone.destroy();
this.destroy(); this.destroy();
}); }, this);
this._onPositionChanged(); this._onPositionChanged();
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
@ -142,12 +142,9 @@ var WindowClone = GObject.registerClass({
let clone = new Clutter.Clone({ source: realDialog }); let clone = new Clutter.Clone({ source: realDialog });
this._updateDialogPosition(realDialog, clone); this._updateDialogPosition(realDialog, clone);
clone._updateId = realDialog.connect('notify::position', dialog => { realDialog.connectObject(
this._updateDialogPosition(dialog, clone); 'notify::position', dialog => this._updateDialogPosition(dialog, clone),
}); 'destroy', () => clone.destroy(), this);
clone._destroyId = realDialog.connect('destroy', () => {
clone.destroy();
});
this.add_child(clone); this.add_child(clone);
} }
@ -163,18 +160,7 @@ var WindowClone = GObject.registerClass({
this.set_position(this.realWindow.x, this.realWindow.y); this.set_position(this.realWindow.x, this.realWindow.y);
} }
_disconnectSignals() {
this.get_children().forEach(child => {
let realWindow = child.source;
realWindow.disconnect(child._updateId);
realWindow.disconnect(child._destroyId);
});
}
_onDestroy() { _onDestroy() {
this._disconnectSignals();
this._delegate = null; this._delegate = null;
if (this.inDrag) { if (this.inDrag) {
@ -291,27 +277,22 @@ var WorkspaceThumbnail = GObject.registerClass({
// Create clones for windows that should be visible in the Overview // Create clones for windows that should be visible in the Overview
this._windows = []; this._windows = [];
this._allWindows = []; this._allWindows = [];
this._minimizedChangedIds = [];
for (let i = 0; i < windows.length; i++) { for (let i = 0; i < windows.length; i++) {
let minimizedChangedId = windows[i].meta_window.connectObject('notify::minimized',
windows[i].meta_window.connect('notify::minimized', this._updateMinimized.bind(this), this);
this._updateMinimized.bind(this));
this._allWindows.push(windows[i].meta_window); this._allWindows.push(windows[i].meta_window);
this._minimizedChangedIds.push(minimizedChangedId);
if (this._isMyWindow(windows[i]) && this._isOverviewWindow(windows[i])) if (this._isMyWindow(windows[i]) && this._isOverviewWindow(windows[i]))
this._addWindowClone(windows[i]); this._addWindowClone(windows[i]);
} }
// Track window changes // Track window changes
this._windowAddedId = this.metaWorkspace.connect('window-added', this.metaWorkspace.connectObject(
this._windowAdded.bind(this)); 'window-added', this._windowAdded.bind(this),
this._windowRemovedId = this.metaWorkspace.connect('window-removed', 'window-removed', this._windowRemoved.bind(this), this);
this._windowRemoved.bind(this)); global.display.connectObject(
this._windowEnteredMonitorId = global.display.connect('window-entered-monitor', 'window-entered-monitor', this._windowEnteredMonitor.bind(this),
this._windowEnteredMonitor.bind(this)); 'window-left-monitor', this._windowLeftMonitor.bind(this), this);
this._windowLeftMonitorId = global.display.connect('window-left-monitor',
this._windowLeftMonitor.bind(this));
this.state = ThumbnailState.NORMAL; this.state = ThumbnailState.NORMAL;
this._slidePosition = 0; // Fully slid in this._slidePosition = 0; // Fully slid in
@ -397,10 +378,9 @@ var WorkspaceThumbnail = GObject.registerClass({
} }
if (!this._allWindows.includes(metaWin)) { if (!this._allWindows.includes(metaWin)) {
let minimizedChangedId = metaWin.connect('notify::minimized', metaWin.connectObject('notify::minimized',
this._updateMinimized.bind(this)); this._updateMinimized.bind(this), this);
this._allWindows.push(metaWin); this._allWindows.push(metaWin);
this._minimizedChangedIds.push(minimizedChangedId);
} }
// We might have the window in our list already if it was on all workspaces and // We might have the window in our list already if it was on all workspaces and
@ -437,9 +417,8 @@ var WorkspaceThumbnail = GObject.registerClass({
_windowRemoved(metaWorkspace, metaWin) { _windowRemoved(metaWorkspace, metaWin) {
let index = this._allWindows.indexOf(metaWin); let index = this._allWindows.indexOf(metaWin);
if (index != -1) { if (index != -1) {
metaWin.disconnect(this._minimizedChangedIds[index]); metaWin.disconnectObject(this);
this._allWindows.splice(index, 1); this._allWindows.splice(index, 1);
this._minimizedChangedIds.splice(index, 1);
} }
this._doRemoveWindow(metaWin); this._doRemoveWindow(metaWin);
@ -468,13 +447,9 @@ var WorkspaceThumbnail = GObject.registerClass({
this._removed = true; this._removed = true;
this.metaWorkspace.disconnect(this._windowAddedId); this.metaWorkspace.disconnectObject(this);
this.metaWorkspace.disconnect(this._windowRemovedId); global.display.disconnectObject(this);
global.display.disconnect(this._windowEnteredMonitorId); this._allWindows.forEach(w => w.disconnectObject(this));
global.display.disconnect(this._windowLeftMonitorId);
for (let i = 0; i < this._allWindows.length; i++)
this._allWindows[i].disconnect(this._minimizedChangedIds[i]);
} }
_onDestroy() { _onDestroy() {
@ -667,40 +642,30 @@ var ThumbnailsBox = GObject.registerClass({
this._thumbnails = []; this._thumbnails = [];
this._overviewSignals = [ Main.overview.connectObject(
Main.overview.connect('showing', 'showing', () => this._createThumbnails(),
() => this._createThumbnails()), 'hidden', () => this._destroyThumbnails(),
Main.overview.connect('hidden', 'item-drag-begin', () => this._onDragBegin(),
() => this._destroyThumbnails()), 'item-drag-end', () => this._onDragEnd(),
Main.overview.connect('item-drag-begin', 'item-drag-cancelled', () => this._onDragCancelled(),
() => this._onDragBegin()), 'window-drag-begin', () => this._onDragBegin(),
Main.overview.connect('item-drag-end', 'window-drag-end', () => this._onDragEnd(),
() => this._onDragEnd()), 'window-drag-cancelled', () => this._onDragCancelled(), this);
Main.overview.connect('item-drag-cancelled',
() => this._onDragCancelled()),
Main.overview.connect('window-drag-begin',
() => this._onDragBegin()),
Main.overview.connect('window-drag-end',
() => this._onDragEnd()),
Main.overview.connect('window-drag-cancelled',
() => this._onDragCancelled()),
];
this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA }); this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA });
this._settings.connect('changed::dynamic-workspaces', this._settings.connect('changed::dynamic-workspaces',
() => this._updateShouldShow()); () => this._updateShouldShow());
this._updateShouldShow(); this._updateShouldShow();
this._monitorsChangedId = Main.layoutManager.connectObject('monitors-changed', () => {
Main.layoutManager.connect('monitors-changed', () => {
this._destroyThumbnails(); this._destroyThumbnails();
if (Main.overview.visible) if (Main.overview.visible)
this._createThumbnails(); this._createThumbnails();
}); }, this);
// The porthole is the part of the screen we're showing in the thumbnails // The porthole is the part of the screen we're showing in the thumbnails
this._workareasChangedId = global.display.connect('workareas-changed', global.display.connectObject('workareas-changed',
() => this._updatePorthole()); () => this._updatePorthole(), this);
this._updatePorthole(); this._updatePorthole();
this.connect('notify::visible', () => { this.connect('notify::visible', () => {
@ -714,8 +679,8 @@ var ThumbnailsBox = GObject.registerClass({
this._syncStackingId = 0; this._syncStackingId = 0;
this._scrollAdjustment = scrollAdjustment; this._scrollAdjustment = scrollAdjustment;
this._scrollValueId = this._scrollAdjustment.connect('notify::value', this._scrollAdjustment.connectObject('notify::value',
() => this._updateIndicator()); () => this._updateIndicator(), this);
} }
setMonitorIndex(monitorIndex) { setMonitorIndex(monitorIndex) {
@ -726,21 +691,6 @@ var ThumbnailsBox = GObject.registerClass({
this._destroyThumbnails(); this._destroyThumbnails();
this._unqueueUpdateStates(); this._unqueueUpdateStates();
if (this._scrollValueId)
this._scrollAdjustment.disconnect(this._scrollValueId);
this._scrollValueId = 0;
if (this._monitorsChangedId)
Main.layoutManager.disconnect(this._monitorsChangedId);
this._monitorsChangedId = 0;
if (this._workareasChangedId)
global.display.disconnect(this._workareasChangedId);
this._workareasChangedId = 0;
this._overviewSignals.forEach(id => Main.overview.disconnect(id));
this._overviewSignals = [];
if (this._settings) if (this._settings)
this._settings.run_dispose(); this._settings.run_dispose();
this._settings = null; this._settings = null;
@ -1002,24 +952,18 @@ var ThumbnailsBox = GObject.registerClass({
if (this._thumbnails.length > 0) if (this._thumbnails.length > 0)
return; return;
let workspaceManager = global.workspace_manager; const { workspaceManager } = global;
workspaceManager.connectObject(
this._nWorkspacesNotifyId = 'notify::n-workspaces', this._workspacesChanged.bind(this),
workspaceManager.connect('notify::n-workspaces', 'active-workspace-changed', () => this._updateIndicator(),
this._workspacesChanged.bind(this)); 'workspaces-reordered', () => {
this._activeWorkspaceChangedId =
workspaceManager.connect('active-workspace-changed',
() => this._updateIndicator());
this._workspacesReorderedId =
workspaceManager.connect('workspaces-reordered', () => {
this._thumbnails.sort((a, b) => { this._thumbnails.sort((a, b) => {
return a.metaWorkspace.index() - b.metaWorkspace.index(); return a.metaWorkspace.index() - b.metaWorkspace.index();
}); });
this.queue_relayout(); this.queue_relayout();
}); }, this);
this._syncStackingId = Main.overview.connectObject('windows-restacked',
Main.overview.connect('windows-restacked', this._syncStacking.bind(this), this);
this._syncStacking.bind(this));
this._targetScale = 0; this._targetScale = 0;
this._scale = 0; this._scale = 0;
@ -1039,25 +983,8 @@ var ThumbnailsBox = GObject.registerClass({
if (this._thumbnails.length == 0) if (this._thumbnails.length == 0)
return; return;
const { workspaceManager } = global; global.workspace_manager.disconnectObject(this);
Main.overview.disconnectObject(this);
if (this._nWorkspacesNotifyId > 0) {
workspaceManager.disconnect(this._nWorkspacesNotifyId);
this._nWorkspacesNotifyId = 0;
}
if (this._activeWorkspaceChangedId > 0) {
workspaceManager.disconnect(this._activeWorkspaceChangedId);
this._activeWorkspaceChangedId = 0;
}
if (this._workspacesReorderedId > 0) {
workspaceManager.disconnect(this._workspacesReorderedId);
this._workspacesReorderedId = 0;
}
if (this._syncStackingId > 0) {
Main.overview.disconnect(this._syncStackingId);
this._syncStackingId = 0;
}
for (let w = 0; w < this._thumbnails.length; w++) for (let w = 0; w < this._thumbnails.length; w++)
this._thumbnails[w].destroy(); this._thumbnails[w].destroy();

121
js/ui/workspacesView.js
View File

@ -37,30 +37,17 @@ var WorkspacesViewBase = GObject.registerClass({
this._monitorIndex = monitorIndex; this._monitorIndex = monitorIndex;
this._inDrag = false; this._inDrag = false;
this._windowDragBeginId = Main.overview.connect('window-drag-begin', this._dragBegin.bind(this)); Main.overview.connectObject(
this._windowDragEndId = Main.overview.connect('window-drag-end', this._dragEnd.bind(this)); 'window-drag-begin', this._dragBegin.bind(this),
'window-drag-end', this._dragEnd.bind(this), this);
this._overviewAdjustment = overviewAdjustment; this._overviewAdjustment = overviewAdjustment;
this._overviewId = overviewAdjustment.connect('notify::value', () => { overviewAdjustment.connectObject('notify::value',
this._updateWorkspaceMode(); () => this._updateWorkspaceMode(), this);
});
} }
_onDestroy() { _onDestroy() {
this._dragEnd(); this._dragEnd();
if (this._windowDragBeginId > 0) {
Main.overview.disconnect(this._windowDragBeginId);
this._windowDragBeginId = 0;
}
if (this._windowDragEndId > 0) {
Main.overview.disconnect(this._windowDragEndId);
this._windowDragEndId = 0;
}
if (this._overviewId > 0) {
this._overviewAdjustment.disconnect(this._overviewId);
delete this._overviewId;
}
} }
_dragBegin() { _dragBegin() {
@ -104,36 +91,33 @@ class WorkspacesView extends WorkspacesViewBase {
this._controls = controls; this._controls = controls;
this._fitModeAdjustment = fitModeAdjustment; this._fitModeAdjustment = fitModeAdjustment;
this._fitModeNotifyId = this._fitModeAdjustment.connect('notify::value', () => { this._fitModeAdjustment.connectObject('notify::value', () => {
this._updateVisibility(); this._updateVisibility();
this._updateWorkspacesState(); this._updateWorkspacesState();
this.queue_relayout(); this.queue_relayout();
}); }, this);
this._animating = false; // tweening this._animating = false; // tweening
this._gestureActive = false; // touch(pad) gestures this._gestureActive = false; // touch(pad) gestures
this._scrollAdjustment = scrollAdjustment; this._scrollAdjustment = scrollAdjustment;
this._onScrollId = this._scrollAdjustment.connect('notify::value', this._scrollAdjustment.connectObject('notify::value',
this._onScrollAdjustmentChanged.bind(this)); this._onScrollAdjustmentChanged.bind(this), this);
this._workspaces = []; this._workspaces = [];
this._updateWorkspaces(); this._updateWorkspaces();
this._updateWorkspacesId = workspaceManager.connectObject(
workspaceManager.connect('notify::n-workspaces', 'notify::n-workspaces', this._updateWorkspaces.bind(this),
this._updateWorkspaces.bind(this)); 'workspaces-reordered', () => {
this._reorderWorkspacesId =
workspaceManager.connect('workspaces-reordered', () => {
this._workspaces.sort((a, b) => { this._workspaces.sort((a, b) => {
return a.metaWorkspace.index() - b.metaWorkspace.index(); return a.metaWorkspace.index() - b.metaWorkspace.index();
}); });
this._workspaces.forEach( this._workspaces.forEach(
(ws, i) => this.set_child_at_index(ws, i)); (ws, i) => this.set_child_at_index(ws, i));
}); }, this);
this._switchWorkspaceNotifyId = global.window_manager.connectObject('switch-workspace',
global.window_manager.connect('switch-workspace', this._activeWorkspaceChanged.bind(this), this);
this._activeWorkspaceChanged.bind(this));
this._updateVisibility(); this._updateVisibility();
} }
@ -491,12 +475,6 @@ class WorkspacesView extends WorkspacesViewBase {
super._onDestroy(); super._onDestroy();
this._workspaces = []; this._workspaces = [];
this._scrollAdjustment.disconnect(this._onScrollId);
this._fitModeAdjustment.disconnect(this._fitModeNotifyId);
global.window_manager.disconnect(this._switchWorkspaceNotifyId);
let workspaceManager = global.workspace_manager;
workspaceManager.disconnect(this._updateWorkspacesId);
workspaceManager.disconnect(this._reorderWorkspacesId);
} }
startTouchGesture() { startTouchGesture() {
@ -623,11 +601,10 @@ class SecondaryMonitorDisplay extends St.Widget {
this._thumbnails.connect('notify::should-show', this._thumbnails.connect('notify::should-show',
() => this._updateThumbnailVisibility()); () => this._updateThumbnailVisibility());
this._stateChangedId = this._overviewAdjustment.connect('notify::value', this._overviewAdjustment.connectObject('notify::value', () => {
() => {
this._updateThumbnailParams(); this._updateThumbnailParams();
this.queue_relayout(); this.queue_relayout();
}); }, this);
this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA }); this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA });
this._settings.connect('changed::workspaces-only-on-primary', this._settings.connect('changed::workspaces-only-on-primary',
@ -738,10 +715,6 @@ class SecondaryMonitorDisplay extends St.Widget {
if (this._settings) if (this._settings)
this._settings.run_dispose(); this._settings.run_dispose();
this._settings = null; this._settings = null;
if (this._stateChangedId)
this._overviewAdjustment.disconnect(this._stateChangedId);
this._stateChangedId = 0;
} }
_workspacesOnPrimaryChanged() { _workspacesOnPrimaryChanged() {
@ -848,13 +821,8 @@ class WorkspacesDisplay extends St.Widget {
let workspaceManager = global.workspace_manager; let workspaceManager = global.workspace_manager;
this._scrollAdjustment = scrollAdjustment; this._scrollAdjustment = scrollAdjustment;
this._switchWorkspaceId = global.window_manager.connectObject('switch-workspace',
global.window_manager.connect('switch-workspace', this._activeWorkspaceChanged.bind(this), this);
this._activeWorkspaceChanged.bind(this));
this._reorderWorkspacesdId =
workspaceManager.connect('workspaces-reordered',
this._workspacesReordered.bind(this));
this._swipeTracker = new SwipeTracker.SwipeTracker( this._swipeTracker = new SwipeTracker.SwipeTracker(
Main.layoutManager.overviewGroup, Main.layoutManager.overviewGroup,
@ -867,16 +835,14 @@ class WorkspacesDisplay extends St.Widget {
this._swipeTracker.connect('end', this._switchWorkspaceEnd.bind(this)); this._swipeTracker.connect('end', this._switchWorkspaceEnd.bind(this));
this.connect('notify::mapped', this._updateSwipeTracker.bind(this)); this.connect('notify::mapped', this._updateSwipeTracker.bind(this));
this._layoutRowsNotifyId = workspaceManager.connect( workspaceManager.connectObject(
'notify::layout-rows', this._updateTrackerOrientation.bind(this)); 'workspaces-reordered', this._workspacesReordered.bind(this),
'notify::layout-rows', this._updateTrackerOrientation.bind(this), this);
this._updateTrackerOrientation(); this._updateTrackerOrientation();
this._windowDragBeginId = Main.overview.connectObject(
Main.overview.connect('window-drag-begin', 'window-drag-begin', this._windowDragBegin.bind(this),
this._windowDragBegin.bind(this)); 'window-drag-end', this._windowDragEnd.bind(this), this);
this._windowDragEndId =
Main.overview.connect('window-drag-end',
this._windowDragEnd.bind(this));
this._primaryVisible = true; this._primaryVisible = true;
this._primaryIndex = Main.layoutManager.primaryIndex; this._primaryIndex = Main.layoutManager.primaryIndex;
@ -884,10 +850,6 @@ class WorkspacesDisplay extends St.Widget {
this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA }); this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA });
this._restackedNotifyId = 0;
this._scrollEventId = 0;
this._keyPressEventId = 0;
this._inWindowDrag = false; this._inWindowDrag = false;
this._leavingOverview = false; this._leavingOverview = false;
@ -901,12 +863,6 @@ class WorkspacesDisplay extends St.Widget {
Meta.later_remove(this._parentSetLater); Meta.later_remove(this._parentSetLater);
this._parentSetLater = 0; this._parentSetLater = 0;
} }
global.window_manager.disconnect(this._switchWorkspaceId);
global.workspace_manager.disconnect(this._reorderWorkspacesdId);
global.workspace_manager.disconnect(this._layoutRowsNotifyId);
Main.overview.disconnect(this._windowDragBeginId);
Main.overview.disconnect(this._windowDragEndId);
} }
_windowDragBegin() { _windowDragBegin() {
@ -1036,14 +992,12 @@ class WorkspacesDisplay extends St.Widget {
this.show(); this.show();
this._updateWorkspacesViews(); this._updateWorkspacesViews();
this._restackedNotifyId = Main.overview.connectObject(
Main.overview.connect('windows-restacked', 'windows-restacked', this._onRestacked.bind(this),
this._onRestacked.bind(this)); 'scroll-event', this._onScrollEvent.bind(this), this);
if (this._scrollEventId == 0)
this._scrollEventId = Main.overview.connect('scroll-event', this._onScrollEvent.bind(this));
if (this._keyPressEventId == 0) global.stage.connectObject(
this._keyPressEventId = global.stage.connect('key-press-event', this._onKeyPressEvent.bind(this)); 'key-press-event', this._onKeyPressEvent.bind(this), this);
} }
prepareToLeaveOverview() { prepareToLeaveOverview() {
@ -1055,18 +1009,9 @@ class WorkspacesDisplay extends St.Widget {
} }
vfunc_hide() { vfunc_hide() {
if (this._restackedNotifyId > 0) { Main.overview.disconnectObject(this);
Main.overview.disconnect(this._restackedNotifyId); global.stage.disconnectObject(this);
this._restackedNotifyId = 0;
}
if (this._scrollEventId > 0) {
Main.overview.disconnect(this._scrollEventId);
this._scrollEventId = 0;
}
if (this._keyPressEventId > 0) {
global.stage.disconnect(this._keyPressEventId);
this._keyPressEventId = 0;
}
for (let i = 0; i < this._workspacesViews.length; i++) for (let i = 0; i < this._workspacesViews.length; i++)
this._workspacesViews[i].destroy(); this._workspacesViews[i].destroy();
this._workspacesViews = []; this._workspacesViews = [];

12
js/ui/xdndHandler.js
View File

@ -21,16 +21,11 @@ var XdndHandler = class {
dnd.connect('dnd-enter', this._onEnter.bind(this)); dnd.connect('dnd-enter', this._onEnter.bind(this));
dnd.connect('dnd-position-change', this._onPositionChanged.bind(this)); dnd.connect('dnd-position-change', this._onPositionChanged.bind(this));
dnd.connect('dnd-leave', this._onLeave.bind(this)); dnd.connect('dnd-leave', this._onLeave.bind(this));
this._windowGroupVisibilityHandlerId = 0;
} }
// Called when the user cancels the drag (i.e release the button) // Called when the user cancels the drag (i.e release the button)
_onLeave() { _onLeave() {
if (this._windowGroupVisibilityHandlerId != 0) { global.window_group.disconnectObject(this);
global.window_group.disconnect(this._windowGroupVisibilityHandlerId);
this._windowGroupVisibilityHandlerId = 0;
}
if (this._cursorWindowClone) { if (this._cursorWindowClone) {
this._cursorWindowClone.destroy(); this._cursorWindowClone.destroy();
this._cursorWindowClone = null; this._cursorWindowClone = null;
@ -40,9 +35,8 @@ var XdndHandler = class {
} }
_onEnter() { _onEnter() {
this._windowGroupVisibilityHandlerId = global.window_group.connectObject('notify::visible',
global.window_group.connect('notify::visible', this._onWindowGroupVisibilityChanged.bind(this), this);
this._onWindowGroupVisibilityChanged.bind(this));
this.emit('drag-begin', global.get_current_time()); this.emit('drag-begin', global.get_current_time());
} }