libtransport.git Changeset - a59f6be32190

Changeset - a59f6be32190

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 14 years ago 2011-08-19 18:24:01
hanzz.k@gmail.com

more memory tweaks

3 files changed with 12 insertions and 10 deletions:

include/transport/buddy.h

src/buddy.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/buddy.h

➞

Show inline comments

@@ @@ -171,19 +171,19 @@ class Buddy { @@
 		/// \param jid Jabber ID.
 		/// \return legacy name of buddy from JID.
 		static std::string JIDToLegacyName(const Swift::JID &jid);
 	private:
 		void generateJID();
 		long m_id;
 		bool m_online;
 		bool m_blocked;
 		std::string m_subscription;
 		Swift::Presence::ref m_lastPresence;
+// 		Swift::Presence::ref m_lastPresence;
 		Swift::JID m_jid;
 		BuddyFlag m_flags;
 		RosterManager *m_rosterManager;
 };
+}

src/buddy.cpp

➞

Show inline comments

@@ @@ -61,25 +61,25 @@ const Swift::JID &Buddy::getJID() { @@
 	if (!m_jid.isValid()) {
 		generateJID();
+	}
 	return m_jid;
+}
 void Buddy::setOnline() {
 	m_online = true;
+}
 void Buddy::setOffline() {
 	m_online = false;
 	m_lastPresence = Swift::Presence::ref();
+// 	m_lastPresence = Swift::Presence::ref();
+}
 bool Buddy::isOnline() {
 	return m_online;
+}
 void Buddy::setSubscription(const std::string &subscription) {
 	m_subscription = subscription;
+}
 const std::string &Buddy::getSubscription() {
 	return m_subscription;
 	if (presence->getType() != Swift::Presence::Unavailable) {
 		// caps
 // 		presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::CapsInfo (CONFIG().caps)));
 // 		if (features & 0/*TRANSPORT_FEATURE_AVATARS*/) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::VCardUpdate (getIconHash())));
 // 		}
 		if (m_blocked) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::BlockPayload ()));
+		}
+	}
 	if (only_new) {
 		if (m_lastPresence)
 			m_lastPresence->setTo(Swift::JID(""));
 		if (m_lastPresence == presence) {
 			return Swift::Presence::ref();
+		}
 		m_lastPresence = presence;
+	}
 // 	if (only_new) {
 // 		if (m_lastPresence)
 // 			m_lastPresence->setTo(Swift::JID(""));
 // 		if (m_lastPresence == presence) {
 // 			return Swift::Presence::ref();
 // 		}
 // 		m_lastPresence = presence;
 // 	}
 	return presence;
+}
 std::string Buddy::getSafeName() {
 	if (m_jid.isValid()) {
 		return m_jid.getNode();
+	}
 	std::string name = getName();
 // 	Transport::instance()->protocol()->prepareUsername(name, purple_buddy_get_account(m_buddy));
 	if (getFlags() & BUDDY_JID_ESCAPING) {
 		name = Swift::JID::getEscapedNode(name);

src/usermanager.cpp

➞

Show inline comments

@@ @@ -22,24 +22,25 @@ @@
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/conversationmanager.h"
 #include "transport/rostermanager.h"
 #include "transport/userregistry.h"
 #include "storageresponder.h"
 #include "log4cxx/logger.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "malloc.h"
 // #include "valgrind/memcheck.h"
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("UserManager");
 UserManager::UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend) {
 	m_cachedUser = NULL;
 	m_onlineBuddies = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
@@ @@ -85,24 +86,25 @@ User *UserManager::getUser(const std::string &barejid){ @@
 		return user;
+	}
 	return NULL;
+}
 void UserManager::removeUser(User *user) {
 	m_users.erase(user->getJID().toBare().toString());
 	if (m_cachedUser == user)
 		m_cachedUser = NULL;
 	onUserDestroyed(user);
 	delete user;
 	malloc_trim(0);
 // 	VALGRIND_DO_LEAK_CHECK;
+}
 int UserManager::getUserCount() {
 	return m_users.size();
+}
 void UserManager::handlePresence(Swift::Presence::ref presence) {
 	std::string barejid = presence->getTo().toBare().toString();
 	std::string userkey = presence->getFrom().toBare().toString();
 	User *user = getUser(userkey);
 	// Create user class if it's not there

0 comments (0 inline, 0 general)