From a02f481295f8fabbb1a173e5977d733c18a8e2ab Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Mar 25 2011 04:42:02 +0000
Subject: Make activating vpn connections work from the shell indicator


---

diff --git a/0001-Account-for-nm_client_activate_connection-API-change.patch b/0001-Account-for-nm_client_activate_connection-API-change.patch
new file mode 100644
index 0000000..6287b70
--- /dev/null
+++ b/0001-Account-for-nm_client_activate_connection-API-change.patch
@@ -0,0 +1,29 @@
+From d49e2bf7712002f8fe09597ee153c426e1627460 Mon Sep 17 00:00:00 2001
+From: Christopher Aillon <caillon@redhat.com>
+Date: Thu, 24 Mar 2011 21:04:31 -0700
+Subject: [PATCH] Account for nm_client_activate_connection API change
+
+based on a suggestion by Ray Strode.
+---
+ js/ui/status/network.js |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index e57349a..a5a25fe 100644
+--- a/js/ui/status/network.js
++++ b/js/ui/status/network.js
+@@ -552,10 +552,9 @@ NMDevice.prototype = {
+     },
+ 
+     _createConnectionItem: function(obj) {
+-        let path = obj.connection.path;
+         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(obj.connection, this.device, null, null);
+         }));
+         return item;
+     },
+-- 
+1.7.4.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 6633cd5..fedd140 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.91.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://live.gnome.org/GnomeShell
 #VCS:           git:git://git.gnome.org/gnome-shell
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/%{name}-%{version}.tar.bz2
+Patch0:         0001-Account-for-nm_client_activate_connection-API-change.patch
 
 %define clutter_version 1.4.0
 %define gobject_introspection_version 0.10.1
@@ -74,6 +75,7 @@ easy to use experience.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nm09-api
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -133,6 +135,9 @@ gconftool-2 --makefile-install-rule \
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 %changelog
+* Thu Mar 24 2011 Christopher Aillon <caillon@redhat.com> - 2.91.92-2
+- Make activating vpn connections work from the shell indicator
+
 * Wed Mar 23 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.92-1
 - Update to 2.91.92