libtransport.git Changeset - 4c87620c9f71

Changeset - 4c87620c9f71

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 15 years ago 2011-05-14 10:34:18
hanzz.k@gmail.com

working message dispatching

4 files changed with 18 insertions and 7 deletions:

backends/libpurple/main.cpp

spectrum/src/CMakeLists.txt

src/networkplugin.cpp

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -316,34 +316,39 @@ static void conv_destroy(PurpleConversation *conv) { @@
 static void conv_write_im(PurpleConversation *conv, const char *who, const char *message, PurpleMessageFlags flags, time_t mtime) {
 	// Don't forwards our own messages.
 	if (flags & PURPLE_MESSAGE_SEND || flags & PURPLE_MESSAGE_SYSTEM)
 		return;
 	PurpleAccount *account = purple_conversation_get_account(conv);
 // 	SpectrumConversation *s_conv = (SpectrumConversation *) conv->ui_data;
 // 	if (!s_conv)
 // 		return;
 // 	boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 	char *striped = purple_markup_strip_html(message);
-	std::string msg = stripped;
+	std::string msg = striped;
 	g_free(striped);
 	np->handleMessage(np->m_accounts[account], who, msg);
 	std::string w = who;
 	size_t pos = w.find("/");
 	if (pos != std::string::npos)
 		w.erase((int) pos, w.length() - (int) pos);
 	np->handleMessage(np->m_accounts[account], w, msg);
+}
 static PurpleConversationUiOps conversation_ui_ops =
+{
 	conv_new,
 	conv_destroy,
 	NULL,
 	NULL,
 	NULL,//conv_write_chat,                              /* write_chat           */
 	conv_write_im,             /* write_im             */
 	NULL,//conv_write_conv,           /* write_conv           */
 	NULL,//conv_chat_add_users,       /* chat_add_users       */
 	NULL,//conv_chat_rename_user,     /* chat_rename_user     */
 	NULL,//conv_chat_remove_users,    /* chat_remove_users    */
 	NULL,//pidgin_conv_chat_update_user,     /* chat_update_user     */
 	NULL,//pidgin_conv_present_conversation, /* present              */
 	NULL,//pidgin_conv_has_focus,            /* has_focus            */
 	NULL,//pidgin_conv_custom_smiley_add,    /* custom_smiley_add    */
 	NULL,//pidgin_conv_custom_smiley_write,  /* custom_smiley_write  */
 	NULL,//pidgin_conv_custom_smiley_close,  /* custom_smiley_close  */

spectrum/src/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(spectrum ${SRC})
 ADD_DEPENDENCIES(spectrum libpurple_backend)
 target_link_libraries(spectrum ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)

src/networkplugin.cpp

➞

Show inline comments

@@ @@ -56,24 +56,25 @@ NetworkPlugin::~NetworkPlugin() { @@
+}
 void NetworkPlugin::handleMessage(const std::string &user, const std::string &legacyName, const std::string &msg) {
 	pbnetwork::ConversationMessage m;
 	m.set_username(user);
 	m.set_buddyname(legacyName);
 	m.set_message(msg);
 	std::string message;
 	m.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);
 	std::cout << "SENDING MESSAGE\n";
 	send(message);
+}
 void NetworkPlugin::handleBuddyChanged(const std::string &user, const std::string &buddyName, const std::string &alias,
 			const std::string &groups, int status, const std::string &statusMessage, const std::string &iconHash) {
 	pbnetwork::Buddy buddy;
 	buddy.set_username(user);
 	buddy.set_buddyname(buddyName);
 	buddy.set_alias(alias);
 	buddy.set_groups(groups);
 	buddy.set_status(status);
 	std::string message;
 	d.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_DISCONNECTED);
 	send(message);
+}
 void NetworkPlugin::handleConnected(bool error) {
 	if (error) {
 		std::cout << "Connecting error\n";
 		m_reconnectTimer->start();
 // 		m_reconnectTimer->start();
 		exit(1);
+	}
 	else {
 		std::cout << "Connected\n";
 		m_reconnectTimer->stop();
+	}
+}
 void NetworkPlugin::handleDisconnected() {
 	std::cout << "Disconnected\n";
 	m_reconnectTimer->start();
 // 	m_reconnectTimer->start();
 	exit(1);
+}
 void NetworkPlugin::connect() {
 	std::cout << "Trying to connect the server\n";
 	m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(m_host), m_port));
 	m_reconnectTimer->stop();
+}
 void NetworkPlugin::handleLoginPayload(const std::string &data) {
 	pbnetwork::Login payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR

src/networkpluginserver.cpp

➞

Show inline comments

 		handleBuddyPayload(buddy, payload);
 		buddy->buddyChanged();
+	}
 	else {
 		buddy = new LocalBuddy(user->getRosterManager(), -1);
 		handleBuddyPayload(buddy, payload);
 		user->getRosterManager()->setBuddy(buddy);
+	}
+}
 void NetworkPluginServer::handleConvMessagePayload(const std::string &data) {
 	pbnetwork::ConversationMessage payload;
 	std::cout << "payload...\n";
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
+	std::cout << "payload 2...\n";
 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname());
 	if (!conv) {
 		conv = new NetworkConversation(user->getConversationManager(), payload.buddyname());
+	}
 	boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 	msg->setBody(payload.message());
 	conv->handleMessage(msg);
+}

0 comments (0 inline, 0 general)