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

 // 	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    */

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

 	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) {
 	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();

src/networkpluginserver.cpp

➞

Show inline comments

 		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) {

0 comments (0 inline, 0 general)