From 6239f90cf0472fd1bc68c1d0037871797aec3eea Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 3 May 2011 17:12:54 +0200
Subject: [PATCH] sipjreen: remove unneeded m_connected state - m_client knows
 better about it

---
 src/sip/jreen/jabber.cpp | 21 +++++++++++----------
 src/sip/jreen/jabber.h   |  2 --
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jreen/jabber.cpp
index 3c4f519c3..7b4645584 100644
--- a/src/sip/jreen/jabber.cpp
+++ b/src/sip/jreen/jabber.cpp
@@ -46,7 +46,6 @@
 JabberPlugin::JabberPlugin()
     : m_menu( 0 )
     , m_addFriendAction( 0 )
-    , m_connected(false)
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -166,13 +165,19 @@ JabberPlugin::connectPlugin( bool startup )
     if ( startup && !TomahawkSettings::instance()->jabberAutoConnect() )
         return false;
 
-    qDebug() << "Connecting to the XMPP server..." << m_connected;
+    if(m_client->isConnected())
+    {
+        qDebug() << Q_FUNC_INFO << "Already connected to server, not connecting again...";
+        return true; //FIXME: should i return false here?!
+    }
+
+    qDebug() << "Connecting to the XMPP server...";
     qDebug() << m_client->jid().full();
-    //m_client->setServer( m_client->jid().domain() );
     qDebug() << m_client->server() << m_client->port();
 
+    //FIXME: we're badly workarounding some missing reconnection api here, to be fixed soon
     QTimer::singleShot(1000, m_client, SLOT( connectToServer() ) );
-    //m_client->connectToServer();
+
 
     return true;
 }
@@ -180,9 +185,9 @@ JabberPlugin::connectPlugin( bool startup )
 void
 JabberPlugin::disconnectPlugin()
 {
-    qDebug() << Q_FUNC_INFO << m_connected;
+    qDebug() << Q_FUNC_INFO;
 
-    if(!m_connected)
+    if(!m_client->isConnected())
         return;
 
     foreach(const Jreen::JID &peer, m_peers.keys())
@@ -240,8 +245,6 @@ JabberPlugin::onConnect()
     //connect( m_room, SIGNAL( messageReceived( Jreen::Message, bool ) ), this, SLOT( onNewMessage( Jreen::Message ) ) );
     //connect( m_room, SIGNAL( presenceReceived( Jreen::Presence, const Jreen::MUCRoom::Participant* ) ), this, SLOT( onNewPresence( Jreen::Presence ) ) );
 
-    m_connected = true;
-
     addMenuHelper();
 }
 
@@ -329,8 +332,6 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
 
     if(reconnect)
         QTimer::singleShot(reconnectInSeconds*1000, this, SLOT(connectPlugin()));
-
-    m_connected = false;
 }
 
 void
diff --git a/src/sip/jreen/jabber.h b/src/sip/jreen/jabber.h
index cb0b3c2b8..ea18ebe6b 100644
--- a/src/sip/jreen/jabber.h
+++ b/src/sip/jreen/jabber.h
@@ -100,8 +100,6 @@ private:
     bool presenceMeansOnline( Jreen::Presence::Type p );
     void handlePeerStatus( const Jreen::JID &jid, Jreen::Presence::Type presenceType );
 
-    bool m_connected;
-
     QMenu* m_menu;
     QAction* m_addFriendAction;