From 27221984c469943ad480baf9a5f3d2b6f33f8a2c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 25 Mar 2011 09:41:32 -0400 Subject: [PATCH] NetworkStatus: Adapt to nm_client_activate_connection api change It now takes a connection directly instead of the object path associated with a connection. --- ...lient_activate_connection-API-change.patch | 44 +++++++++++++++---- gnome-shell.spec | 5 ++- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/0001-Account-for-nm_client_activate_connection-API-change.patch b/0001-Account-for-nm_client_activate_connection-API-change.patch index 6287b70..b520ab9 100644 --- a/0001-Account-for-nm_client_activate_connection-API-change.patch +++ b/0001-Account-for-nm_client_activate_connection-API-change.patch @@ -1,17 +1,27 @@ -From d49e2bf7712002f8fe09597ee153c426e1627460 Mon Sep 17 00:00:00 2001 -From: Christopher Aillon -Date: Thu, 24 Mar 2011 21:04:31 -0700 -Subject: [PATCH] Account for nm_client_activate_connection API change +From 66edfa88a1f72d120c5b99d54aada1b6810239b0 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 25 Mar 2011 09:36:59 -0400 +Subject: [PATCH] NetworkStatus: Adapt to nm_client_activate_connection api change -based on a suggestion by Ray Strode. +It now takes a connection directly instead of the object path associated +with a connection. --- - js/ui/status/network.js | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + js/ui/status/network.js | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index e57349a..a5a25fe 100644 +index e57349a..7990332 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js +@@ -379,7 +379,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); @@ -552,10 +552,9 @@ NMDevice.prototype = { }, @@ -24,6 +34,24 @@ index e57349a..a5a25fe 100644 })); return item; }, +@@ -1001,7 +1000,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; + } + } +@@ -1136,7 +1135,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; + } + } -- 1.7.4.1 diff --git a/gnome-shell.spec b/gnome-shell.spec index fedd140..bedee0a 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 2.91.92 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -135,6 +135,9 @@ gconftool-2 --makefile-install-rule \ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %changelog +* Fri Mar 25 2011 Ray Strode 2.91.92-3 +- Adjustments for More nm-client api changes. + * Thu Mar 24 2011 Christopher Aillon - 2.91.92-2 - Make activating vpn connections work from the shell indicator