libtransport.git Changeset - 25f5516757ed

Changeset - 25f5516757ed

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 14 years ago 2011-07-17 04:26:55
hanzz.k@gmail.com

Fixed double delete on legacy network error

3 files changed with 8 insertions and 2 deletions:

include/transport/usermanager.h

spectrum/src/sample.cfg

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -74,12 +74,16 @@ class UserManager { @@
 		boost::signal<void (User *user)> onUserDestroyed;
 		bool isUserConnected(const std::string &barejid) const {
 			return m_users.find(barejid) != m_users.end();
+		}
 		UserRegistry *getUserRegistry() {
 			return m_userRegistry;
+		}
 		void connectUser(const Swift::JID &user);
 	private:
 		void handlePresence(Swift::Presence::ref presence);
 		void handleMessageReceived(Swift::Message::ref message);
 		void handleGeneralPresenceReceived(Swift::Presence::ref presence);

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -10,14 +10,14 @@ admin_username=admin @@
 admin_password=test
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
 users_per_backend=2
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=prpl-jabber
 protocol=prpl-msn
 #protocol=prpl-icq
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

src/user.cpp

➞

Show inline comments

@@ @@ -188,14 +188,16 @@ void User::handleDisconnected(const std::string &error) { @@
 	// In server mode, server finishes the session and pass unavailable session to userManager,
 	// so we can't removeUser() in server mode, because it would be removed twice.
 	// Once in finishSession and once in m_userManager->removeUser.
 	if (m_component->inServerMode()) {
 		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
 		if (!m_readyForConnect) {
 			m_userManager->removeUser(this);
+		}
+	}
 	else {
 		m_userManager->removeUser(this);
+	}
+}
+}

0 comments (0 inline, 0 general)