From 5c9b4c6aef47ee97ddf03347bf36a3c2c928b115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pasi=20Sj=C3=B6holm?= <pasi.sjoholm@jollamobile.com>
Date: Fri, 29 Aug 2014 02:26:02 +0300
Subject: [PATCH] [connectionagent] fix wlan<->wifi and mobile<->cellular in
 connectToType

---
 connd/qconnectionagent.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
index 9155e2c..20c123e 100644
--- a/connd/qconnectionagent.cpp
+++ b/connd/qconnectionagent.cpp
@@ -304,8 +304,17 @@ void QConnectionAgent::connectToType(const QString &type)
         return;
     }
 
+    QString convType;
+    if (type.contains("mobile")) {
+        convType="cellular";
+    } else if (type.contains("wlan")) {
+        convType="wifi";
+    } else {
+        convType=type;
+    }
+
     Q_FOREACH (const QString &path, servicesMap.keys()) {
-        if (path.contains(type)) {
+        if (path.contains(convType)) {
             if (!isStateOnline(servicesMap.value(path)->state())) {
                 if (servicesMap.value(path)->autoConnect()) {
                     qDebug() << "<<<<<<<<<<< requestConnect() >>>>>>>>>>>>";
@@ -318,7 +327,13 @@ void QConnectionAgent::connectToType(const QString &type)
         }
     }
 
-    Q_EMIT configurationNeeded(type);
+    if (type.contains("cellular")) {
+        convType="mobile";
+    } else if (type.contains("wifi")) {
+        convType="wlan";
+    }
+
+    Q_EMIT configurationNeeded(convType);
 }
 
 void QConnectionAgent::onScanFinished()