Merge lp:~online-accounts/signon-plugin-oauth2/packaging into lp:signon-plugin-oauth2/rtm-14.09

[David Barth]

RTM 14.09 backport of the fix for Bug #1377181: Account creation fails repeatedly, then it works

RTM 14.09 backport of the fix for Bug #1377181: Account creation fails repeatedly, then it works

[David Barth (dbarth)]

review: Approve

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2012-07-20 05:46:13 +0000
+++ src/plugin.cpp	2014-10-29 14:26:58 +0000
@@ -39,7 +39,7 @@
 Plugin::Plugin(QObject *parent):
     AuthPluginInterface(parent),
     impl(0),
-    m_networkAccessManager(new QNetworkAccessManager(this))
+    m_networkAccessManager(0)
 {
     TRACE();
 }
@@ -75,6 +75,10 @@
 {
     if (impl != 0) delete impl;
 
+    if (!m_networkAccessManager) {
+        m_networkAccessManager = new QNetworkAccessManager(this);
+    }
+
     if (OAuth1Plugin::mechanisms().contains(mechanism)) {
         impl = new OAuth1Plugin(this);
     } else if (OAuth2Plugin::mechanisms().contains(mechanism)) {