Changeset - 95ba00c2fe6a
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Jan Kaluza - 13 years ago 2012-10-04 10:47:24
hanzz.k@gmail.com
Use __FreeBSD__ instead of BSD
2 files changed with 4 insertions and 4 deletions:
backends/libpurple/main.cpp
2
2
src/usermanager.cpp
2
2
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -8,25 +8,25 @@
 

			




	
	
	
		
 
#include "purple.h"

			




	
	
	
		
 
#include <algorithm>

			




	
	
	
		
 
#include <iostream>

			




	
	
	
		
 

			




	
	
	
		
 
#include "transport/networkplugin.h"

			




	
	
	
		
 
#include "transport/logging.h"

			




	
	
	
		
 
#include "transport/config.h"

			




	
	
	
		
 
#include "transport/logging.h"

			




	
	
	
		
 
#include "geventloop.h"

			




	
	
	
		
 

			




	
	
	
		
 
// #include "valgrind/memcheck.h"

			




	
	
	
		
 
#ifndef BSD

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#include "malloc.h"

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#include <algorithm>

			




	
	
	
		
 
#include "errno.h"

			




	
	
	
		
 
#include <boost/make_shared.hpp>

			




	
	
	
		
 

			




	
	
	
		
 
#ifdef WITH_LIBEVENT

			




	
	
	
		
 
#include <event.h>

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
#ifdef WIN32

			




	
	
	
		
 
#include "win32/win32dep.h"

			




	
	
		
 
@@ -357,25 +357,25 @@ class SpectrumNetworkPlugin : public NetworkPlugin {

			




	
	
	
		
 
					std::string data = stringOf(purple_account_get_int_wrapped(account, "version", 0));

			




	
	
	
		
 
					g_file_set_contents ("gfire.cfg", data.c_str(), data.size(), NULL);

			




	
	
	
		
 
				}

			




	
	
	
		
 
// 				VALGRIND_DO_LEAK_CHECK;

			




	
	
	
		
 
				m_sessions.erase(user);

			




	
	
	
		
 
				purple_account_disconnect_wrapped(account);

			




	
	
	
		
 
				purple_account_set_enabled_wrapped(account, "spectrum", FALSE);

			




	
	
	
		
 

			




	
	
	
		
 
				m_accounts.erase(account);

			




	
	
	
		
 

			




	
	
	
		
 
				purple_accounts_delete_wrapped(account);

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#ifndef BSD

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
				malloc_trim(0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
// 				VALGRIND_DO_LEAK_CHECK;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleStatusChangeRequest(const std::string &user, int status, const std::string &statusMessage) {

			




	
	
	
		
 
			PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
				int st;

			




	
	
	
		
 
				switch(status) {

			




        

    


    
    

    

        

                

                    src/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,25 +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 "transport/logging.h"

			




	
	
	
		
 
#include "storageresponder.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "Swiften/Swiften.h"

			




	
	
	
		
 
#include "Swiften/Server/ServerStanzaChannel.h"

			




	
	
	
		
 
#include "Swiften/Elements/StreamError.h"

			




	
	
	
		
 
#ifndef BSD

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#include "malloc.h"

			




	
	
	
		
 
#endif

			




	
	
	
		
 
// #include "valgrind/memcheck.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
DEFINE_LOGGER(logger, "UserManager");

			




	
	
	
		
 

			




	
	
	
		
 
UserManager::UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend) {

			




	
	
	
		
 
	m_cachedUser = NULL;

			




	
	
	
		
 
	m_onlineBuddies = 0;

			




	
	
	
		
 
	m_sentToXMPP = 0;

			




	
	
		
 
@@ -117,25 +117,25 @@ void UserManager::removeUser(User *user, bool onUserBehalf) {

			




	
	
	
		
 
		// Transport::PresenceOracle could still contain his last presence.

			




	
	
	
		
 
		// We have to clear all received presences for this user in PresenceOracle.

			




	
	
	
		
 
		m_component->getPresenceOracle()->clearPresences(user->getJID().toBare());

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (m_storageBackend && onUserBehalf) {

			




	
	
	
		
 
		m_storageBackend->setUserOnline(user->getUserInfo().id, false);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	onUserDestroyed(user);

			




	
	
	
		
 
	delete user;

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#ifndef BSD

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
	malloc_trim(0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
// 	VALGRIND_DO_LEAK_CHECK;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UserManager::removeAllUsers(bool onUserBehalf) {

			




	
	
	
		
 
	while(m_users.begin() != m_users.end()) {

			




	
	
	
		
 
		removeUser((*m_users.begin()).second, onUserBehalf);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-12228
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support