Changeset - be6e854f3795
Parent rev.
Child rev.
[Not reviewed]
0 2 0
HanzZ - 14 years ago 2011-07-31 19:10:48
hanzz.k@gmail.com
fixed vcards with prpl-any
2 files changed with 9 insertions and 5 deletions:
backends/libpurple/main.cpp
7
3
spectrum/src/sample.cfg
2
2
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -343,24 +343,28 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 
					purple_conv_im_send(PURPLE_CONV_IM(conv), _markup);
 
					g_free(_markup);
 
				}
 
				else {
 
					purple_conv_im_send(PURPLE_CONV_IM(conv), xhtml.c_str());
 
				}
 
			}
 
		}
 

			




	
	
	
		
 
		void handleVCardRequest(const std::string &user, const std::string &legacyName, unsigned int id) {

			




	
	
	
		
 
			PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
				std::string name = legacyName;

			




	
	
	
		
 
				if (CONFIG_STRING(config, "service.protocol") == "any") {

			




	
	
	
		
 
					name = name.substr(name.find(".") + 1);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				serv_get_info(purple_account_get_connection(account), legacyName.c_str());

			




	
	
	
		
 
				m_vcards[user + legacyName] = id;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleVCardUpdatedRequest(const std::string &user, const std::string &p) {

			




	
	
	
		
 
			PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
				gssize size = p.size();

			




	
	
	
		
 
				// this will be freed by libpurple

			




	
	
	
		
 
				guchar *photo = (guchar *) g_malloc(size * sizeof(guchar));

			




	
	
	
		
 
				memcpy(photo, p.c_str(), size);

			




	
	
		
 
@@ -575,25 +579,25 @@ static bool getStatus(PurpleBuddy *m_buddy, Swift::StatusShow &status, std::stri

			




	
	
	
		
 
		g_free(stripped);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else

			




	
	
	
		
 
		statusMessage = "";

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static std::string getIconHash(PurpleBuddy *m_buddy) {

			




	
	
	
		
 
	char *avatarHash = NULL;

			




	
	
	
		
 
	PurpleBuddyIcon *icon = purple_buddy_icons_find(purple_buddy_get_account(m_buddy), purple_buddy_get_name(m_buddy));

			




	
	
	
		
 
	if (icon) {

			




	
	
	
		
 
		avatarHash = purple_buddy_icon_get_full_path(icon);

			




	
	
	
		
 
// 		purple_buddy_icon_unref(icon);

			




	
	
	
		
 
		purple_buddy_icon_unref(icon);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (avatarHash) {

			




	
	
	
		
 
		// Check if it's patched libpurple which saves icons to directories

			




	
	
	
		
 
		char *hash = strrchr(avatarHash,'/');

			




	
	
	
		
 
		std::string h;

			




	
	
	
		
 
		if (hash) {

			




	
	
	
		
 
			char *dot;

			




	
	
	
		
 
			hash++;

			




	
	
	
		
 
			dot = strchr(hash, '.');

			




	
	
	
		
 
			if (dot)

			




	
	
	
		
 
				*dot = '\0';

			




	
	
		
 
@@ -823,25 +827,25 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif

			




	
	
	
		
 
		if (displayname) {

			




	
	
	
		
 
			nickname = displayname;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		// avatar

			




	
	
	
		
 
		PurpleStoredImage *avatar = purple_buddy_icons_find_account_icon(account);

			




	
	
	
		
 
		if (avatar) {

			




	
	
	
		
 
			const gchar * data = (const gchar *) purple_imgstore_get_data(avatar);

			




	
	
	
		
 
			size_t len = purple_imgstore_get_size(avatar);

			




	
	
	
		
 
			if (len < 300000 && data) {

			




	
	
	
		
 
				photo = Swift::createByteArray(data, len);

			




	
	
	
		
 
			}

			




	
	
	
		
 
// 			purple_imgstore_unref(avatar);

			




	
	
	
		
 
			purple_imgstore_unref(avatar);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if ((!firstName.empty() || !lastName.empty()) && fullName.empty())

			




	
	
	
		
 
		fullName = firstName + " " + lastName;

			




	
	
	
		
 

			




	
	
	
		
 
	PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(gc), who);

			




	
	
	
		
 
	if (buddy && photo.size() == 0) {

			




	
	
	
		
 
		gsize len;

			




	
	
	
		
 
		PurpleBuddyIcon *icon = NULL;

			




	
	
	
		
 
		icon = purple_buddy_icons_find(purple_connection_get_account(gc), name.c_str());

			




	
	
	
		
 
		if (icon) {

			




	
	
		
 
@@ -853,25 +857,25 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif

			




	
	
	
		
 
				photo = Swift::createByteArray(data, len);

			




	
	
	
		
 
// 				const gchar *ext = (gchar*)purple_buddy_icon_get_extension(icon);

			




	
	
	
		
 
// 				if (ext) {

			




	
	
	
		
 
// 					std::string extension(ext);

			




	
	
	
		
 
// 					if (extension != "icon") {

			




	
	
	
		
 
// 						if (extension == "jpg") {

			




	
	
	
		
 
// 							extension = "jpeg";

			




	
	
	
		
 
// 						}

			




	
	
	
		
 
// 						photo->addChild( new Tag("TYPE", "image/" + extension) );

			




	
	
	
		
 
// 					}

			




	
	
	
		
 
// 				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
// 			purple_buddy_icon_unref(icon);

			




	
	
	
		
 
			purple_buddy_icon_unref(icon);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	

			




	
	
	
		
 
	np->handleVCard(np->m_accounts[account], np->m_vcards[np->m_accounts[account] + name], name, fullName, nickname, Swift::byteArrayToString(photo));

			




	
	
	
		
 
	np->m_vcards.erase(np->m_accounts[account] + name);

			




	
	
	
		
 

			




	
	
	
		
 
	return NULL;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static PurpleNotifyUiOps notifyUiOps =

			




	
	
	
		
 
{

			




        

    


    
    

    

        

                

                    spectrum/src/sample.cfg
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,26 +4,26 @@ password = secret

			




	
	
	
		
 
server = 127.0.0.1

			




	
	
	
		
 
port = 5222

			




	
	
	
		
 
server_mode = 1

			




	
	
	
		
 
backend_host=localhost # < this option doesn't work yet

			




	
	
	
		
 
backend_port=10001

			




	
	
	
		
 
admin_username=admin

			




	
	
	
		
 
admin_password=test

			




	
	
	
		
 
#cert= #patch to PKCS#12 certificate

			




	
	
	
		
 
#cert_password= #password to that certificate if any

			




	
	
	
		
 
users_per_backend=10

			




	
	
	
		
 
backend=../../backends/libpurple/spectrum_libpurple_backend

			




	
	
	
		
 
#backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend

			




	
	
	
		
 
protocol=prpl-msn

			




	
	
	
		
 
#protocol=any

			




	
	
	
		
 
#protocol=prpl-msn

			




	
	
	
		
 
protocol=any

			




	
	
	
		
 
#protocol=prpl-icq

			




	
	
	
		
 

			




	
	
	
		
 
[backend]

			




	
	
	
		
 
default_avatar=catmelonhead.jpg

			




	
	
	
		
 

			




	
	
	
		
 
[logging]

			




	
	
	
		
 
#config=logging.cfg # log4cxx/log4j logging configuration file

			




	
	
	
		
 
#backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

			




	
	
	
		
 

			




	
	
	
		
 
[database]

			




	
	
	
		
 
type = none # or "none" without database backend

			




	
	
	
		
 
database = test.sql

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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