[connectionagent] Add servicePath to ConnAdaptor::errorReported() signal

sailfishos · Jun 7, 2013 · e6e4cc5 · e6e4cc5
1 parent 63429ee
commit e6e4cc5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/connd/com.jollamobile.Connectiond.xml b/connd/com.jollamobile.Connectiond.xml
@@ -9,6 +9,7 @@
       <arg name="type" type="s" direction="out"/>
     </signal>
     <signal name="errorReported">
+      <arg name="servicePath" type="s" direction="out"/>
       <arg name="error" type="s" direction="out"/>
     </signal>
     <signal name="requestBrowser">

diff --git a/connd/connadaptor.h b/connd/connadaptor.h
@@ -37,6 +37,7 @@ class ConnAdaptor: public QDBusAbstractAdaptor
 "      <arg direction=\"out\" type=\"s\" name=\"type\"/>\n"
 "    </signal>\n"
 "    <signal name=\"errorReported\">\n"
+"      <arg direction=\"out\" type=\"s\" name=\"servicePath\"/>\n"
 "      <arg direction=\"out\" type=\"s\" name=\"error\"/>\n"
 "    </signal>\n"
 "    <signal name=\"requestBrowser\">\n"
@@ -84,7 +85,7 @@ public Q_SLOTS: // METHODS
     void configurationNeeded(const QString &type);
     void connectionRequest();
     void connectionState(const QString &state, const QString &type);
-    void errorReported(const QString &error);
+    void errorReported(const QString &servicePath, const QString &error);
     void requestBrowser(const QString &url);
     void roamingAskChanged(bool askRoaming);
     void userInputCanceled();

diff --git a/connectionagentplugin/connectionagentplugin.cpp b/connectionagentplugin/connectionagentplugin.cpp
@@ -82,8 +82,8 @@ void ConnectionAgentPlugin::connectToConnectiond(QString)
     connect(connManagerInterface,SIGNAL(userInputCanceled()),
             this,SIGNAL(userInputCanceled()));
 
-    connect(connManagerInterface,SIGNAL(errorReported(QString)),
-                     this,SLOT(onErrorReported(QString)));
+    connect(connManagerInterface, SIGNAL(errorReported(QString, QString)),
+            this, SLOT(onErrorReported(QString, QString)));
 
     connect(connManagerInterface,SIGNAL(connectionState(QString, QString)),
                      this,SLOT(onConnectionState(QString, QString)));

diff --git a/connectionagentplugin/connectionamanagerinterface.h b/connectionagentplugin/connectionamanagerinterface.h
@@ -67,7 +67,7 @@ public Q_SLOTS: // METHODS
     void configurationNeeded(const QString &type);
     void connectionRequest();
     void connectionState(const QString &state, const QString &type);
-    void errorReported(const QString &error);
+    void errorReported(const QString &servicePath, const QString &error);
     void requestBrowser(const QString &url);
     void roamingAskChanged(bool askRoaming);
     void userInputCanceled();

diff --git a/test/auto/tst_connectionagent_plugin/tst_connectionagent_plugintest.cpp b/test/auto/tst_connectionagent_plugin/tst_connectionagent_plugintest.cpp
@@ -102,12 +102,12 @@ void Tst_connectionagent_pluginTest::testRequestConnection()
 
 void Tst_connectionagent_pluginTest::testErrorReported()
 {
-    QSignalSpy spy(plugin, SIGNAL(errorReported(QString)));
+    QSignalSpy spy(plugin, SIGNAL(errorReported(QString, QString)));
     plugin->connectToType("test");
     QTest::qWait(2000);
     QCOMPARE(spy.count(),1);
     QList<QVariant> arguments = spy.takeFirst();
-    QCOMPARE(arguments.at(0).toString(), QString("Type not valid"));
+    QCOMPARE(arguments.at(1).toString(), QString("Type not valid"));
 }
 
 void Tst_connectionagent_pluginTest::testUserInputRequested_data()