[kde-plasma-nm/f20] Fix autoconnect with OpenConnect VPN

[David Woodhouse]

commit 63ea209ac0d770e4f6cc468914e6837e027880b4
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Mon Jul 14 12:15:20 2014 +0100

    Fix autoconnect with OpenConnect VPN

 ...andling-of-autoconnect-in-OpenConnect-VPN.patch |   27 ++++++++++++++++++++
 kde-plasma-nm.spec                                 |    7 ++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-handling-of-autoconnect-in-OpenConnect-VPN.patch b/0001-Fix-handling-of-autoconnect-in-OpenConnect-VPN.patch
new file mode 100644
index 0000000..5b1768d
--- /dev/null
+++ b/0001-Fix-handling-of-autoconnect-in-OpenConnect-VPN.patch
@@ -0,0 +1,27 @@
+From 0af2498a68a24e710844f095ac1638c6f1b7c5bc Mon Sep 17 00:00:00 2001
+From: David Woodhouse <David.Woodhouse at intel.com>
+Date: Mon, 14 Jul 2014 11:11:13 +0100
+Subject: [PATCH] Fix handling of 'autoconnect' in OpenConnect VPN
+
+We can't call connectHost() directly from the readSecrets() function; we
+need to set it up to be called when the dialog is rendered instead.
+---
+ vpn/openconnect/openconnectauth.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vpn/openconnect/openconnectauth.cpp b/vpn/openconnect/openconnectauth.cpp
+index be92b56..8ee82cc 100644
+--- a/vpn/openconnect/openconnectauth.cpp
++++ b/vpn/openconnect/openconnectauth.cpp
+@@ -230,7 +230,7 @@ void OpenconnectAuthWidget::readSecrets()
+ 
+     if (d->secrets["autoconnect"] == "yes") {
+         d->ui.chkAutoconnect->setChecked(true);
+-        connectHost();
++        connect(this, SIGNAL(activated(int)), this, SLOT(connectHost()));
+     }
+     if (!d->secrets["certsigs"].isEmpty()) {
+         d->certificateFingerprints.append(d->secrets["certsigs"].split('\t'));
+-- 
+1.9.3
+
diff --git a/kde-plasma-nm.spec b/kde-plasma-nm.spec
index c2bbf67..286af02 100644
--- a/kde-plasma-nm.spec
+++ b/kde-plasma-nm.spec
@@ -1,13 +1,14 @@
 %global         git_commit 61bb6a0
 Name:           kde-plasma-nm
 Version:        0.9.3.4
-Release:        7.20140702git%{git_commit}%{?dist}
+Release:        8.20140702git%{git_commit}%{?dist}
 Summary:        Plasma applet written in QML for managing network connections
 License:        LGPLv2+ and GPLv2+
 URL:            https://projects.kde.org/projects/playground/network/plasma-nm
 # Source0:        http://download.kde.org/unstable/plasma-nm//plasma-nm-%{version}.tar.xz
 # # Package from git snapshots using releaseme scripts
 Source0:        plasma-nm-%{version}.tar.xz
+Patch1:         0001-Fix-handling-of-autoconnect-in-OpenConnect-VPN.patch
 
 # Add plasma-nm to default systray if needed, for upgraders...
 Source10: 01-fedora-plasma-nm.js
@@ -114,6 +115,7 @@ Provides:       kde-plasma-networkmanagement-pptp = 1:%{version}-%{release}
 
 %prep
 %setup -qn plasma-nm-%{version}
+%patch1 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -231,6 +233,9 @@ fi
 %endif
 
 %changelog
+* Mon Jul 14 2014 David Woodhouse <dwmw2 at infradead.org> - 0.9.3.4-8.20140702git61bb6a0
+- fix handling of 'autoconnect' option for OpenConnect VPN
+
 * Wed Jul 09 2014 David Woodhouse <dwmw2 at infradead.org> - 0.9.3.4-7.20140702git61bb6a0
 - bump to rebuild against OpenConnect 6.00