Added comments to networkhandlerprivate.cpp.
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 28 May 2010 13:00:21 +0000 (16:00 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 28 May 2010 13:00:21 +0000 (16:00 +0300)
src/network/networkhandlerprivate.cpp

index 2331943..3763de7 100644 (file)
@@ -35,7 +35,7 @@ NetworkHandlerPrivate::NetworkHandlerPrivate(QObject *parent)
       m_connected(false),
       m_connecting(false)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
     m_parent = static_cast<NetworkHandler*>(parent);
 
@@ -51,7 +51,7 @@ NetworkHandlerPrivate::NetworkHandlerPrivate(QObject *parent)
 
 void NetworkHandlerPrivate::stateChanged(const QDBusMessage &message)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
     if (message.arguments().count() > CONNECTION_STATE_INDEX) {
 
@@ -64,18 +64,22 @@ void NetworkHandlerPrivate::stateChanged(const QDBusMessage &message)
                 m_connecting = false;
                 emit m_parent->disconnected();
             }
+            if (connectionState == ICD_STATE_DISCONNECTING) {
+                m_connecting = false;
+            }
             else if ((connectionState == ICD_STATE_CONNECTED) &&(!isConnected())) {
                 m_connected = true;
                 m_connecting = false;
                 emit m_parent->connected();
             }
+            qWarning() << __PRETTY_FUNCTION__ << m_connected;
         }
     }
 }
 
 void NetworkHandlerPrivate::connect()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
     if (!m_connecting && !m_connected) {
         m_connecting = true;
@@ -86,7 +90,7 @@ void NetworkHandlerPrivate::connect()
 
 void NetworkHandlerPrivate::disconnect()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
     dBusInterface->call(ICD_DBUS_API_DISCONNECT_REQ,
                         QVariant((unsigned int)ICD_CONNECTION_FLAG_USER_EVENT));
@@ -94,14 +98,14 @@ void NetworkHandlerPrivate::disconnect()
 
 bool NetworkHandlerPrivate::isConnected()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__ << m_connected;
 
     return m_connected;
 }
 
 void NetworkHandlerPrivate::state()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
     dBusInterface->call(ICD_DBUS_API_STATE_REQ);
 }