From 1b31fd5afed1c478bab0a00fe108d15bcbc14297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 24 Jul 2018 11:49:00 +0200 Subject: [PATCH] cleanup: Don't call method via a parent's prototype We cannot disconnect a signal handler via the usual disconnect() as nm_device_disconnect() shadows the GObject method, but we can use g_signal_handler_disconnect(). https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/626 --- js/ui/status/network.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 1f7f80765..8f128da15 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -331,11 +331,11 @@ var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection { destroy() { if (this._stateChangedId) { - GObject.Object.prototype.disconnect.call(this._device, this._stateChangedId); + GObject.signal_handler_disconnect(this._device, this._stateChangedId); this._stateChangedId = 0; } if (this._activeConnectionChangedId) { - GObject.Object.prototype.disconnect.call(this._device, this._activeConnectionChangedId); + GObject.signal_handler_disconnect(this._device, this._activeConnectionChangedId); this._activeConnectionChangedId = 0; } @@ -1187,11 +1187,11 @@ var NMDeviceWireless = class { destroy() { if (this._activeApChangedId) { - GObject.Object.prototype.disconnect.call(this._device, this._activeApChangedId); + GObject.signal_handler_disconnect(this._device, this._activeApChangedId); this._activeApChangedId = 0; } if (this._stateChangedId) { - GObject.Object.prototype.disconnect.call(this._device, this._stateChangedId); + GObject.signal_handler_disconnect(this._device, this._stateChangedId); this._stateChangedId = 0; } if (this._strengthChangedId > 0) {