From 7e9be7cd70bfb02253c75756762efb6b2f513300 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mar 25 2011 13:53:41 +0000
Subject: NetworkStatus: fix vpn indicator


It looks like a part of the code wasn't updated to reflect
a variable name change.

---

diff --git a/fix-vpn-indicator.patch b/fix-vpn-indicator.patch
new file mode 100644
index 0000000..b7eee90
--- /dev/null
+++ b/fix-vpn-indicator.patch
@@ -0,0 +1,27 @@
+From 3af64ea2d2a0b76da1a974966d9be21779e308e8 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 25 Mar 2011 09:49:15 -0400
+Subject: [PATCH] NetworkStatus: fix vpn indicator
+
+It looks like a part of the code wasn't updated to reflect
+a variable name change.
+---
+ js/ui/status/network.js |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index 7990332..4bfbd21 100644
+--- a/js/ui/status/network.js
++++ b/js/ui/status/network.js
+@@ -1752,7 +1752,7 @@ NMApplet.prototype = {
+                         }
+                     }
+                 } else
+-                    a._primaryDevice = this._vpnDevice;
++                    a._primaryDevice = this._devices.vpn.device
+ 
+                 if (a._primaryDevice)
+                     a._primaryDevice.setActiveConnection(a);
+-- 
+1.7.4.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index bedee0a..b4c0192 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -9,6 +9,7 @@ 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
+Patch1:         fix-vpn-indicator.patch
 
 %define clutter_version 1.4.0
 %define gobject_introspection_version 0.10.1
@@ -76,6 +77,7 @@ easy to use experience.
 %prep
 %setup -q
 %patch0 -p1 -b .nm09-api
+%patch1 -p1 -b .fix-vpn-indicator
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -137,6 +139,7 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %changelog
 * Fri Mar 25 2011 Ray Strode <rstrode@redhat.com> 2.91.92-3
 - Adjustments for More nm-client api changes.
+- Fix VPN indicator
 
 * Thu Mar 24 2011 Christopher Aillon <caillon@redhat.com> - 2.91.92-2
 - Make activating vpn connections work from the shell indicator