libtransport.git Changeset - 36f4fb8870c9

Changeset - 36f4fb8870c9

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-09-11 18:26:18
hanzz.k@gmail.com

Forward transport presence in User::setConnected call

2 files changed with 47 insertions and 22 deletions:

include/transport/user.h

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/user.h

➞

Show inline comments

@@ @@ -90,17 +90,15 @@ class User { @@
 		void handleDisconnected(const std::string &error);
 		bool isReadyToConnect() {
 			return m_readyForConnect;
+		}
 		void setConnected(bool connected) {
 			m_connected = connected;
 			setIgnoreDisconnect(false);
 			updateLastActivity();
+		}
 		void setConnected(bool connected);
 		void sendCurrentPresence();
 		void setIgnoreDisconnect(bool ignoreDisconnect);
 		bool isConnected() {
 			return m_connected;
+		}

src/user.cpp

➞

Show inline comments

+	}
 	LOG4CXX_INFO(logger, m_jid.toString() << ": No JID with " << feature << " feature");
 	return jid;
+}
 void User::sendCurrentPresence() {
 	if (m_component->inServerMode()) {
 		return;
+	}
 	if (m_connected) {
 		Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 		if (highest) {
 			Swift::Presence::ref response = Swift::Presence::create(highest);
 			response->setTo(m_jid);
 			response->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendPresence(response);
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << response->getType());
 			onPresenceChanged(highest);
+		}
 		else {
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(m_jid.toBare());
 			response->setFrom(m_component->getJID());
 			response->setType(Swift::Presence::Unavailable);
 			m_component->getStanzaChannel()->sendPresence(response);
 			onPresenceChanged(response);
+		}
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(m_jid.toBare());
 		response->setFrom(m_component->getJID());
 		response->setType(Swift::Presence::Unavailable);
 		response->setStatus("Connecting");
 		m_component->getStanzaChannel()->sendPresence(response);
 		onPresenceChanged(response);
+	}
+}
 void User::setConnected(bool connected) {
 	m_connected = connected;
 	setIgnoreDisconnect(false);
 	updateLastActivity();
 	sendCurrentPresence();
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	std::cout << "PRESENCE " << presence->getFrom().toString() << "\n";
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)
 		if (m_readyForConnect == false) {
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to join room " << presence->getTo().getNode() << " as " << presence->getTo().getResource());
 			onRoomJoined(presence->getTo().getNode(), presence->getTo().getResource(), "");
+		}
 		return;
+	}
 	Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 	if (highest) {
 		Swift::Presence::ref response = Swift::Presence::create(highest);
 		response->setTo(presence->getFrom().toBare());
 		response->setFrom(m_component->getJID());
 		m_component->getStanzaChannel()->sendPresence(response);
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << response->getType());
 		onPresenceChanged(highest);
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(m_jid.toBare());
 		response->setFrom(m_component->getJID());
 		response->setType(Swift::Presence::Unavailable);
 		m_component->getStanzaChannel()->sendPresence(response);
 		onPresenceChanged(response);
+	}
 	sendCurrentPresence();
+}
 void User::handleSubscription(Swift::Presence::ref presence) {
 	m_rosterManager->handleSubscription(presence);
+}

0 comments (0 inline, 0 general)