Changeset - 3bb462ee5727
Parent rev.
Child rev.
[Not reviewed]
Merge
3 40 13
Jan Kaluza - 10 years ago 2016-01-21 13:25:34
hanzz.k@gmail.com
Merge pull request #99 from vitalyster/purple_roomlist

Purple roomlist
4 files changed with 51 insertions and 0 deletions:
backends/libpurple/main.cpp
32
backends/libpurple/purple_defs.cpp
10
backends/libpurple/purple_defs.h
8
spectrum/src/frontends/xmpp/discoinforesponder.cpp
1
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -1558,33 +1558,64 @@ static PurpleXferUiOps xferUiOps =
 
	XferCreated,
 
	XferDestroyed,
 
	NULL,
 
	NULL,
 
	xferCanceled,
 
	xferCanceled,
 
	XferWrite,
 
	XferRead,
 
	XferNotSent,
 
	NULL
 
};
 

			




	
	
	
		
 
static void RoomlistProgress(PurpleRoomlist *list, gboolean in_progress)

			




	
	
	
		
 
{

			




	
	
	
		
 
	if (!in_progress) 

			




	
	
	
		
 
	{

			




	
	
	
		
 
		GList *rooms;

			




	
	
	
		
 
		std::list<std::string> m_rooms;

			




	
	
	
		
 
		for (rooms = list->rooms; rooms != NULL; rooms = rooms->next)

			




	
	
	
		
 
		{

			




	
	
	
		
 
			PurpleRoomlistRoom *room = (PurpleRoomlistRoom *)rooms->data;	

			




	
	
	
		
 
			m_rooms.push_back(room->name);

			




	
	
	
		
 
		}

			




	
	
	
		
 
		np->handleRoomList("", m_rooms, m_rooms);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static PurpleRoomlistUiOps roomlist_ui_ops =

			




	
	
	
		
 
{

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	RoomlistProgress,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL,

			




	
	
	
		
 
	NULL

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static void transport_core_ui_init(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
	purple_blist_set_ui_ops_wrapped(&blistUiOps);

			




	
	
	
		
 
	purple_accounts_set_ui_ops_wrapped(&accountUiOps);

			




	
	
	
		
 
	purple_notify_set_ui_ops_wrapped(&notifyUiOps);

			




	
	
	
		
 
	purple_request_set_ui_ops_wrapped(&requestUiOps);

			




	
	
	
		
 
	purple_xfers_set_ui_ops_wrapped(&xferUiOps);

			




	
	
	
		
 
	purple_connections_set_ui_ops_wrapped(&conn_ui_ops);

			




	
	
	
		
 
	purple_conversations_set_ui_ops_wrapped(&conversation_ui_ops);

			




	
	
	
		
 
	purple_roomlist_set_ui_ops_wrapped(&roomlist_ui_ops);

			




	
	
	
		
 
	

			




	
	
	
		
 
// #ifndef WIN32

			




	
	
	
		
 
// 	purple_dnsquery_set_ui_ops_wrapped(getDNSUiOps());

			




	
	
	
		
 
// #endif

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/***** Core Ui Ops *****/

			




	
	
	
		
 
static void

			




	
	
	
		
 
spectrum_glib_log_handler(const gchar *domain,

			




	
	
	
		
 
						  GLogLevelFlags flags,

			




	
	
	
		
 
						  const gchar *message,

			




	
	
	
		
 
						  gpointer user_data)

			




	
	
	
		
 
{

			




	
	
		
 
@@ -1663,24 +1694,25 @@ static PurpleCoreUiOps coreUiOps =

			




	
	
	
		
 
	NULL

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static void signed_on(PurpleConnection *gc, gpointer unused) {

			




	
	
	
		
 
	PurpleAccount *account = purple_connection_get_account_wrapped(gc);

			




	
	
	
		
 
	np->handleConnected(np->m_accounts[account]);

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#if !defined(__FreeBSD__) && !defined(__APPLE__)

			




	
	
	
		
 
	// force returning of memory chunks allocated by libxml2 to kernel

			




	
	
	
		
 
	malloc_trim(0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	purple_roomlist_get_list_wrapped(gc);

			




	
	
	
		
 
	

			




	
	
	
		
 
	// For prpl-gg

			




	
	
	
		
 
	execute_purple_plugin_action(gc, "Download buddylist from Server");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static void printDebug(PurpleDebugLevel level, const char *category, const char *arg_s) {

			




	
	
	
		
 
	std::string c("");

			




	
	
	
		
 
	std::string args(arg_s);

			




	
	
	
		
 
	args.erase(args.size() - 1);

			




	
	
	
		
 

			




	
	
	
		
 
	if (category) {

			




	
	
	
		
 
		c.append(category);

			




        

    


    
    

    

        

                

                    backends/libpurple/purple_defs.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -91,24 +91,26 @@ purple_timeout_add_seconds_wrapped_fnc purple_timeout_add_seconds_wrapped = NULL

			




	
	
	
		
 
purple_eventloop_set_ui_ops_wrapped_fnc purple_eventloop_set_ui_ops_wrapped = NULL;

			




	
	
	
		
 
purple_input_remove_wrapped_fnc purple_input_remove_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_ui_ready_wrapped_fnc purple_xfer_ui_ready_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_request_accepted_wrapped_fnc purple_xfer_request_accepted_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_request_denied_wrapped_fnc purple_xfer_request_denied_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_get_account_wrapped_fnc purple_xfer_get_account_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_get_filename_wrapped_fnc purple_xfer_get_filename_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_get_size_wrapped_fnc purple_xfer_get_size_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_unref_wrapped_fnc purple_xfer_unref_wrapped = NULL;

			




	
	
	
		
 
purple_xfer_ref_wrapped_fnc purple_xfer_ref_wrapped = NULL;

			




	
	
	
		
 
purple_xfers_set_ui_ops_wrapped_fnc purple_xfers_set_ui_ops_wrapped = NULL;

			




	
	
	
		
 
purple_xfers_get_handle_wrapped_fnc purple_xfers_get_handle_wrapped = NULL;

			




	
	
	
		
 
purple_roomlist_set_ui_ops_wrapped_fnc purple_roomlist_set_ui_ops_wrapped = NULL;

			




	
	
	
		
 
purple_roomlist_get_list_wrapped_fnc purple_roomlist_get_list_wrapped = NULL;

			




	
	
	
		
 
purple_imgstore_get_data_wrapped_fnc purple_imgstore_get_data_wrapped = NULL;

			




	
	
	
		
 
purple_imgstore_get_size_wrapped_fnc purple_imgstore_get_size_wrapped = NULL;

			




	
	
	
		
 
purple_imgstore_unref_wrapped_fnc purple_imgstore_unref_wrapped = NULL;

			




	
	
	
		
 
purple_notify_user_info_new_wrapped_fnc purple_notify_user_info_new_wrapped = NULL;

			




	
	
	
		
 
purple_notify_user_info_destroy_wrapped_fnc purple_notify_user_info_destroy_wrapped = NULL;

			




	
	
	
		
 
purple_notify_user_info_get_entries_wrapped_fnc purple_notify_user_info_get_entries_wrapped = NULL;

			




	
	
	
		
 
purple_notify_user_info_entry_get_label_wrapped_fnc purple_notify_user_info_entry_get_label_wrapped = NULL;

			




	
	
	
		
 
purple_notify_user_info_entry_get_value_wrapped_fnc purple_notify_user_info_entry_get_value_wrapped = NULL;

			




	
	
	
		
 
purple_notify_set_ui_ops_wrapped_fnc purple_notify_set_ui_ops_wrapped = NULL;

			




	
	
	
		
 
purple_plugins_add_search_path_wrapped_fnc purple_plugins_add_search_path_wrapped = NULL;

			




	
	
	
		
 
purple_plugin_action_free_wrapped_fnc purple_plugin_action_free_wrapped = NULL;

			




	
	
	
		
 
purple_prefs_load_wrapped_fnc purple_prefs_load_wrapped = NULL;

			




	
	
		
 
@@ -533,24 +535,32 @@ bool resolvePurpleFunctions() {

			




	
	
	
		
 
	purple_xfer_ref_wrapped = (purple_xfer_ref_wrapped_fnc)GetProcAddress(f_hPurple, "purple_xfer_ref");

			




	
	
	
		
 
	if (!purple_xfer_ref_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	purple_xfers_set_ui_ops_wrapped = (purple_xfers_set_ui_ops_wrapped_fnc)GetProcAddress(f_hPurple, "purple_xfers_set_ui_ops");

			




	
	
	
		
 
	if (!purple_xfers_set_ui_ops_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	purple_xfers_get_handle_wrapped = (purple_xfers_get_handle_wrapped_fnc)GetProcAddress(f_hPurple, "purple_xfers_get_handle");

			




	
	
	
		
 
	if (!purple_xfers_get_handle_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	purple_roomlist_set_ui_ops_wrapped = (purple_roomlist_set_ui_ops_wrapped_fnc)GetProcAddress(f_hPurple, "purple_roomlist_set_ui_ops");

			




	
	
	
		
 
        if (!purple_roomlist_set_ui_ops_wrapped)

			




	
	
	
		
 
                return false;

			




	
	
	
		
 
	

			




	
	
	
		
 
	purple_roomlist_get_list_wrapped = (purple_roomlist_get_list_wrapped_fnc)GetProcAddress(f_hPurple, "purple_roomlist_get_list");

			




	
	
	
		
 
	if (!purple_roomlist_get_list_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	purple_imgstore_get_data_wrapped = (purple_imgstore_get_data_wrapped_fnc)GetProcAddress(f_hPurple, "purple_imgstore_get_data");

			




	
	
	
		
 
	if (!purple_imgstore_get_data_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	purple_imgstore_get_size_wrapped = (purple_imgstore_get_size_wrapped_fnc)GetProcAddress(f_hPurple, "purple_imgstore_get_size");

			




	
	
	
		
 
	if (!purple_imgstore_get_size_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	purple_imgstore_unref_wrapped = (purple_imgstore_unref_wrapped_fnc)GetProcAddress(f_hPurple, "purple_imgstore_unref");

			




	
	
	
		
 
	if (!purple_imgstore_unref_wrapped)

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    backends/libpurple/purple_defs.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -305,24 +305,30 @@ extern purple_xfer_get_size_wrapped_fnc purple_xfer_get_size_wrapped;

			




	
	
	
		
 
typedef void  (_cdecl * purple_xfer_unref_wrapped_fnc)(PurpleXfer *xfer);

			




	
	
	
		
 
extern purple_xfer_unref_wrapped_fnc purple_xfer_unref_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef void  (_cdecl * purple_xfer_ref_wrapped_fnc)(PurpleXfer *xfer);

			




	
	
	
		
 
extern purple_xfer_ref_wrapped_fnc purple_xfer_ref_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef void  (_cdecl * purple_xfers_set_ui_ops_wrapped_fnc)(PurpleXferUiOps *ops);

			




	
	
	
		
 
extern purple_xfers_set_ui_ops_wrapped_fnc purple_xfers_set_ui_ops_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef void * (_cdecl * purple_xfers_get_handle_wrapped_fnc)(void);

			




	
	
	
		
 
extern purple_xfers_get_handle_wrapped_fnc purple_xfers_get_handle_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef void (_cdecl * purple_roomlist_set_ui_ops_wrapped_fnc)(PurpleRoomlistUiOps *ops);

			




	
	
	
		
 
extern purple_roomlist_set_ui_ops_wrapped_fnc purple_roomlist_set_ui_ops_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef PurpleRoomlist * (_cdecl * purple_roomlist_get_list_wrapped_fnc)(PurpleConnection *con);

			




	
	
	
		
 
extern purple_roomlist_get_list_wrapped_fnc purple_roomlist_get_list_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef gconstpointer  (_cdecl * purple_imgstore_get_data_wrapped_fnc)(PurpleStoredImage *img);

			




	
	
	
		
 
extern purple_imgstore_get_data_wrapped_fnc purple_imgstore_get_data_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef size_t  (_cdecl * purple_imgstore_get_size_wrapped_fnc)(PurpleStoredImage *img);

			




	
	
	
		
 
extern purple_imgstore_get_size_wrapped_fnc purple_imgstore_get_size_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef PurpleStoredImage * (_cdecl * purple_imgstore_unref_wrapped_fnc)(PurpleStoredImage *img);

			




	
	
	
		
 
extern purple_imgstore_unref_wrapped_fnc purple_imgstore_unref_wrapped;

			




	
	
	
		
 

			




	
	
	
		
 
typedef PurpleNotifyUserInfo * (_cdecl * purple_notify_user_info_new_wrapped_fnc)(void);

			




	
	
	
		
 
extern purple_notify_user_info_new_wrapped_fnc purple_notify_user_info_new_wrapped;

			




	
	
	
		
 

			




	
	
		
 
@@ -551,24 +557,26 @@ extern wpurple_g_io_channel_win32_new_socket_wrapped_fnc wpurple_g_io_channel_wi

			




	
	
	
		
 
#define purple_eventloop_set_ui_ops_wrapped purple_eventloop_set_ui_ops

			




	
	
	
		
 
#define purple_input_remove_wrapped purple_input_remove

			




	
	
	
		
 
#define purple_xfer_ui_ready_wrapped purple_xfer_ui_ready

			




	
	
	
		
 
#define purple_xfer_request_accepted_wrapped purple_xfer_request_accepted

			




	
	
	
		
 
#define purple_xfer_request_denied_wrapped purple_xfer_request_denied

			




	
	
	
		
 
#define purple_xfer_get_account_wrapped purple_xfer_get_account

			




	
	
	
		
 
#define purple_xfer_get_filename_wrapped purple_xfer_get_filename

			




	
	
	
		
 
#define purple_xfer_get_size_wrapped purple_xfer_get_size

			




	
	
	
		
 
#define purple_xfer_unref_wrapped purple_xfer_unref

			




	
	
	
		
 
#define purple_xfer_ref_wrapped purple_xfer_ref

			




	
	
	
		
 
#define purple_xfers_set_ui_ops_wrapped purple_xfers_set_ui_ops

			




	
	
	
		
 
#define purple_xfers_get_handle_wrapped purple_xfers_get_handle

			




	
	
	
		
 
#define purple_roomlist_set_ui_ops_wrapped purple_roomlist_set_ui_ops

			




	
	
	
		
 
#define purple_roomlist_get_list_wrapped purple_roomlist_get_list

			




	
	
	
		
 
#define purple_imgstore_get_data_wrapped purple_imgstore_get_data

			




	
	
	
		
 
#define purple_imgstore_get_size_wrapped purple_imgstore_get_size

			




	
	
	
		
 
#define purple_imgstore_unref_wrapped purple_imgstore_unref

			




	
	
	
		
 
#define purple_notify_user_info_new_wrapped purple_notify_user_info_new

			




	
	
	
		
 
#define purple_notify_user_info_destroy_wrapped purple_notify_user_info_destroy

			




	
	
	
		
 
#define purple_notify_user_info_get_entries_wrapped purple_notify_user_info_get_entries

			




	
	
	
		
 
#define purple_notify_user_info_entry_get_label_wrapped purple_notify_user_info_entry_get_label

			




	
	
	
		
 
#define purple_notify_user_info_entry_get_value_wrapped purple_notify_user_info_entry_get_value

			




	
	
	
		
 
#define purple_notify_set_ui_ops_wrapped purple_notify_set_ui_ops

			




	
	
	
		
 
#define purple_plugins_add_search_path_wrapped purple_plugins_add_search_path

			




	
	
	
		
 
#define purple_plugin_action_free_wrapped purple_plugin_action_free

			




	
	
	
		
 
#define purple_prefs_load_wrapped purple_prefs_load

			




        

    


    
    

    

        

                

                    spectrum/src/frontends/xmpp/discoinforesponder.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -144,24 +144,25 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J

			




	
	
	
		
 
				return true;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			boost::shared_ptr<DiscoInfo> res(new DiscoInfo(m_transportInfo));

			




	
	
	
		
 
			res->setNode(info->getNode());

			




	
	
	
		
 
			sendResponse(from, id, res);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
	// disco#info for room

			




	
	
	
		
 
	else if (m_rooms.find(to.toBare().toString()) != m_rooms.end()) {

			




	
	
	
		
 
		boost::shared_ptr<DiscoInfo> res(new DiscoInfo());

			




	
	
	
		
 
		res->addIdentity(DiscoInfo::Identity(m_rooms[to.toBare().toString()], "conference", "text"));

			




	
	
	
		
 
		res->addFeature("http://jabber.org/protocol/muc");

			




	
	
	
		
 
		res->setNode(info->getNode());

			




	
	
	
		
 
		sendResponse(from, to, id, res);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	// disco#info for buddy

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		boost::shared_ptr<DiscoInfo> res(new DiscoInfo(*m_buddyInfo));

			




	
	
	
		
 
		res->setNode(info->getNode());

			




	
	
	
		
 
		sendResponse(from, to, id, res);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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