Changeset - 762d04e9c140
[Not reviewed]
0 2 0
root root@spectrum2.(none) - 11 years ago 2014-09-02 18:31:10

Skype: check for new messages every 10 seconds
2 files changed with 25 insertions and 2 deletions:
0 comments (0 inline, 0 general)
backends/skype/main.cpp
Show inline comments
 
@@ -23,13 +23,12 @@
 
#include "malloc.h"
 
#endif
 

	
 
#include "skype.h"
 
#include "skypeplugin.h"
 

	
 

	
 
DEFINE_LOGGER(logger, "backend");
 

	
 
using namespace Transport;
 

	
 
static void spectrum_sigchld_handler(int sig)
 
{
backends/skype/skype.cpp
Show inline comments
 
@@ -54,12 +54,20 @@ Skype::Skype(SkypePlugin *np, const std::string &user, const std::string &userna
 
	m_proxy = 0;
 
	m_timer = -1;
 
	m_counter = 0;
 
	m_np = np;
 
}
 

	
 
static gboolean skype_check_missedmessages(gpointer data) {
 
	Skype *skype = (Skype *) data;
 

	
 
	skype->send_command("SEARCH MISSEDCHATMESSAGES");
 

	
 
	return TRUE;
 
}
 

	
 
static gboolean load_skype_buddies(gpointer data) {
 
	Skype *skype = (Skype *) data;
 
	return skype->loadSkypeBuddies();
 
}
 

	
 
static gboolean create_dbus_proxy(gpointer data) {
 
@@ -146,12 +154,13 @@ bool Skype::createDBusProxy() {
 
			DBusObjectPathVTable vtable;
 
			vtable.message_function = &skype_notify_handler;
 
			dbus_connection_register_object_path(dbus_g_connection_get_connection(m_connection), "/com/Skype/Client", &vtable, this);
 

	
 
			m_counter = 0;
 
			m_timer = g_timeout_add_seconds(1, load_skype_buddies, this);
 
			g_timeout_add_seconds(10, skype_check_missedmessages, this);
 
			return FALSE;
 
		}
 
		return TRUE;
 
	}
 
	return FALSE;
 
}
 
@@ -280,12 +289,13 @@ bool Skype::loadSkypeBuddies() {
 
		}
 
		g_strfreev(full_friends_list);
 
	}
 

	
 
	send_command("SET AUTOAWAY OFF");
 
	send_command("SET USERSTATUS ONLINE");
 

	
 
	return FALSE;
 
}
 

	
 
void Skype::logout() {
 
	if (m_pid != 0) {
 
		if (m_proxy) {
 
@@ -430,19 +440,33 @@ void Skype::handleSkypeMessage(std::string &message) {
 
				std::vector<std::string> groups;
 
				groups.push_back(grp);
 
				m_np->handleBuddyChanged(getUser(), u, alias, groups, status, mood_text);
 
			}
 
		}
 
	}
 
	else if ((cmd[0] == "MESSAGES") || (cmd[0] == "CHATMESSAGES")) {
 
		std::string msgs = GET_RESPONSE_DATA(message, "CHATMESSAGES");
 
		std::vector<std::string> data;
 
		boost::split(data, msgs, boost::is_any_of(","));
 
		BOOST_FOREACH(std::string str, data) {
 
			boost::trim(str);
 
			if (!str.empty()) {
 
			    std::string re = send_command("GET CHATMESSAGE " + str + " STATUS");
 
			    handleSkypeMessage(re);
 
			}
 
		}
 
	}
 
	else if (cmd[0] == "CHATMESSAGE") {
 
		if (cmd[3] == "RECEIVED") {
 
			GET_PROPERTY(body, "CHATMESSAGE", cmd[1], "BODY");
 
			GET_PROPERTY(from_handle, "CHATMESSAGE", cmd[1], "FROM_HANDLE");
 

	
 
			if (from_handle == getUsername())
 
			if (from_handle == getUsername()) {
 
				send_command("SET CHATMESSAGE " + cmd[1] + " SEEN");
 
				return;
 
			}
 

	
 
			m_np->handleMessage(getUser(), from_handle, body);
 

	
 
			send_command("SET CHATMESSAGE " + cmd[1] + " SEEN");
 
		}
 
	}
0 comments (0 inline, 0 general)