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

network: Get dbus path from NMDevice

Browse Source 
In the NetworkManager new version the NMDevice.get_path returns pci
path, we need to use NM prototype to get device dbus path.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4565

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2194>
This commit is contained in:
Xiaoguang Wang 2022-02-21 09:11:23 +08:00 committed by Marge Bot
parent 23047b6d80
commit 8655814329
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -990,7 +990,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
// 802.1x-enabled APs require further configuration, so they're // 802.1x-enabled APs require further configuration, so they're
// handled in gnome-control-center // handled in gnome-control-center
launchSettingsPanel('wifi', 'connect-8021x-wifi', launchSettingsPanel('wifi', 'connect-8021x-wifi',
this._device.get_path(), accessPoints[0].get_path()); this._getDeviceDBusPath(), accessPoints[0].get_path());
} else { } else {
let connection = new NM.SimpleConnection(); let connection = new NM.SimpleConnection();
this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null); this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null);
@ -1000,6 +1000,11 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
this.close(); this.close();
} }
_getDeviceDBusPath() {
// nm_object_get_path() is shadowed by nm_device_get_path()
return NM.Object.prototype.get_path.call(this._device);
}
_notifySsidCb(accessPoint) { _notifySsidCb(accessPoint) {
if (accessPoint.get_ssid() != null) { if (accessPoint.get_ssid() != null) {
accessPoint.disconnect(accessPoint._notifySsidId); accessPoint.disconnect(accessPoint._notifySsidId);