[gnome-shell] NetworkStatus: Adapt to nm_client_activate_connection api change
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] NetworkStatus: Adapt to nm_client_activate_connection api change
- Date: Sat, 26 Mar 2011 00:39:20 +0000 (UTC)
commit 63078fba5b4b443d64efebd8ee3fe75bbb104187
Author: Ray Strode <rstrode redhat com>
Date: Fri Mar 25 09:36:59 2011 -0400
NetworkStatus: Adapt to nm_client_activate_connection api change
It now takes a connection directly instead of the object path associated
with a connection.
js/ui/status/network.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 4183877..bd57ed7 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -395,7 +395,7 @@ NMDevice.prototype = {
// pick the most recently used connection and connect to that
// or if no connections ever set, create an automatic one
if (this._connections.length > 0) {
- this._client.activate_connection(this._connections[0].connection.path, this.device, null, null);
+ this._client.activate_connection(this._connections[0].connection, this.device, null, null);
} else if (this._autoConnectionName) {
let connection = this._createAutomaticConnection();
this._client.add_and_activate_connection(connection, this.device, null, null);
@@ -582,10 +582,11 @@ NMDevice.prototype = {
},
_createConnectionItem: function(obj) {
- let path = obj.connection.path;
+ let connection = obj.connection;
let item = new PopupMenu.PopupMenuItem(obj.name);
+
item.connect('activate', Lang.bind(this, function() {
- this._client.activate_connection(path, this.device, null, null);
+ this._client.activate_connection(connection, this.device, null, null);
}));
return item;
},
@@ -1061,7 +1062,7 @@ NMDeviceWireless.prototype = {
for (let i = 0; i < bestApObj.accessPoints.length; i++) {
let ap = bestApObj.accessPoints[i];
if (this._connectionValidForAP(best, ap)) {
- this._client.activate_connection(best.path, this.device, ap.dbus_path, null);
+ this._client.activate_connection(best, this.device, ap.dbus_path, null);
break;
}
}
@@ -1196,7 +1197,7 @@ NMDeviceWireless.prototype = {
let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
for (let i = 0; i < accessPoints.length; i++) {
if (this._connectionValidForAP(connection, accessPoints[i])) {
- this._client.activate_connection(connection.path, this.device, accessPoints[i].dbus_path, null);
+ this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
break;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]