[connectionagent] remove handover settle timer

sailfishos · Oct 3, 2013 · 915cdf0 · 915cdf0
1 parent 3b5cb45
commit 915cdf0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/connd/qconnectionmanager.cpp b/connd/qconnectionmanager.cpp
@@ -42,9 +42,6 @@
 
 #include <QObject>
 #include <QSettings>
-#include <QTimer>
-
-
 
 QConnectionManager* QConnectionManager::self = NULL;
 
@@ -385,7 +382,6 @@ void QConnectionManager::connectToNetworkService(const QString &servicePath)
                     QOfonoConnectionContext oContext;
                     oContext.setContextPath(contextPath);
                     oContext.setActive(true);
-                    QTimer::singleShot(10 * 1000,this,SLOT(timeout()));
                     return;
                 }
             }
@@ -535,6 +531,8 @@ void QConnectionManager::connectionHandover(const QString &oldService, const QSt
 void QConnectionManager::networkStateChanged(const QString &state)
 {
     qDebug() << Q_FUNC_INFO << state;
+    if (state == "online")
+        handoverInProgress = false;
 
     QSettings confFile;
     confFile.beginGroup("Connectionagent");
@@ -679,7 +677,6 @@ void QConnectionManager::requestDisconnect(const QString &servicePath)
                                "net.connman.Service", QDBusConnection::systemBus());
         QDBusMessage reply = service.call(QDBus::NoBlock, QStringLiteral("Disconnect"));
         manuallyDisconnectedService.clear();
-        QTimer::singleShot(10 * 1000,this,SLOT(timeout()));
     }
 }
 
@@ -695,12 +692,5 @@ void QConnectionManager::requestConnect(const QString &servicePath)
         manualConnected = false;
         autoConnectService = servicePath;
         manuallyConnectedService.clear();
-        QTimer::singleShot(10 * 1000,this,SLOT(timeout()));
     }
 }
-
-void QConnectionManager::timeout()
-{
-    qDebug() << Q_FUNC_INFO << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
-    handoverInProgress = false;
-}
diff --git a/connd/qconnectionmanager.h b/connd/qconnectionmanager.h
@@ -129,8 +129,6 @@ private slots:
     void onServiceConnectionStarted();
 
     void onServiceDisconnectionStarted();
-
-    void timeout();
 };
 
 #endif // QCONNECTIONMANAGER_H