fix proper signalling

sailfishos · Apr 11, 2013 · 8a1ed7c · 8a1ed7c
1 parent 7857f08
commit 8a1ed7c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/connectionagentplugin/connectionagentplugin.cpp b/connectionagentplugin/connectionagentplugin.cpp
@@ -69,8 +69,8 @@ void ConnectionAgentPlugin::connectToConnectiond(QString)
     }
     connect(connManagerInterface,SIGNAL(connectionRequest()),
             this,SLOT(onConnectionRequested()));
-    connect(connManagerInterface,SIGNAL(wlanConfigurationNeeded()),
-            this,SIGNAL(wlanConfigurationNeeded()));
+    connect(connManagerInterface,SIGNAL(configurationNeeded(QString)),
+            this,SIGNAL(configurationNeeded(QString)));
 
     connect(connManagerInterface,SIGNAL(userInputCanceled()),
             this,SIGNAL(userInputCanceled()));
@@ -147,12 +147,6 @@ void ConnectionAgentPlugin::connectiondUnregistered(QString)
     }
 }
 
-void ConnectionAgentPlugin::onConfigurationNeeded(const QString &type)
-{
-    qDebug() << Q_FUNC_INFO;
-    Q_EMIT configurationNeeded(type);
-}
-
 void ConnectionAgentPlugin::onConnectionState(const QString &state, const QString &type)
 {
     qDebug() << Q_FUNC_INFO << state << type;

diff --git a/connectionagentplugin/connectionagentplugin.h b/connectionagentplugin/connectionagentplugin.h
@@ -53,7 +53,6 @@ private slots:
     void onRequestBrowser(const QString &url);
     void onUserInputRequested(const QString &service, const QVariantMap &fields);
     void onConnectionRequested();
-    void onConfigurationNeeded(const QString &type);
     void onConnectionState(const QString &state, const QString &type);
 
     void connectToConnectiond(const QString = QString());

diff --git a/connectionagentplugin/connectionamanagerinterface.h b/connectionagentplugin/connectionamanagerinterface.h
@@ -59,7 +59,7 @@ public Q_SLOTS: // METHODS
     void requestBrowser(const QString &url);
     void userInputCanceled();
     void userInputRequested(const QString &service, const QVariantMap &fields);
-    void wlanConfigurationNeeded();
+    void configurationNeeded(const QString &type);
 };
 
 namespace com {