libtransport.git Changeset - 8fff6fe5e6f3

Changeset - 8fff6fe5e6f3

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 10 years ago 2016-01-23 20:14:07
jkaluza@redhat.com

Another debug

1 file changed with 1 insertions and 2 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -467,49 +467,49 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 						st = PURPLE_STATUS_AVAILABLE;
 						break;
+				}
 				gchar *_markup = purple_markup_escape_text_wrapped(statusMessage.c_str(), -1);
 				std::string markup(_markup);
 				g_free(_markup);
 				// we are already connected so we have to change status
 				const PurpleStatusType *status_type = purple_account_get_status_type_with_primitive_wrapped(account, (PurpleStatusPrimitive) st);
 				if (status_type != NULL) {
 					// send presence to legacy network
 					if (!markup.empty()) {
 						purple_account_set_status_wrapped(account, purple_status_type_get_id_wrapped(status_type), TRUE, "message", markup.c_str(), NULL);
+					}
 					else {
 						purple_account_set_status_wrapped(account, purple_status_type_get_id_wrapped(status_type), TRUE, NULL);
+					}
+				}
+			}
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml, const std::string &id) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
-				LOG4CXX_INFO(logger, "Sending message to '" << legacyName.c_str() << "'");
 				LOG4CXX_INFO(logger, "Sending message to '" << legacyName << "'");
 				PurpleConversation *conv = purple_find_conversation_with_account_wrapped(PURPLE_CONV_TYPE_CHAT, legacyName.c_str(), account);
 				if (!conv) {
 					conv = purple_find_conversation_with_account_wrapped(PURPLE_CONV_TYPE_IM, legacyName.c_str(), account);
 					if (!conv) {
 						conv = purple_conversation_new_wrapped(PURPLE_CONV_TYPE_IM, account, legacyName.c_str());
+					}
+				}
 				if (xhtml.empty()) {
 					gchar *_markup = purple_markup_escape_text_wrapped(message.c_str(), -1);
 					if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM) {
 						purple_conv_im_send_wrapped(PURPLE_CONV_IM_WRAPPED(conv), _markup);
+					}
 					else if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_CHAT) {
 						purple_conv_chat_send_wrapped(PURPLE_CONV_CHAT_WRAPPED(conv), _markup);
+					}
 					g_free(_markup);
+				}
 				else {
 					if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM) {
 						purple_conv_im_send_wrapped(PURPLE_CONV_IM_WRAPPED(conv), xhtml.c_str());
+					}
 					else if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_CHAT) {
 						purple_conv_chat_send_wrapped(PURPLE_CONV_CHAT_WRAPPED(conv), xhtml.c_str());
+					}
 static void buddyListRemoveNode(PurpleBlistNode *node) {
 	if (!PURPLE_BLIST_NODE_IS_BUDDY_WRAPPED(node))
 		return;
+}
 static PurpleBlistUiOps blistUiOps =
+{
 	NULL,
 	buddyListNewNode,
 	NULL,
 	buddyListUpdate,
 	buddyNodeRemoved,
 	NULL,
 	NULL,
 	NULL, // buddyListAddBuddy,
 	NULL,
 	NULL,
 	buddyListSaveNode,
 	buddyListRemoveNode,
 	buddyListSaveAccount,
 	NULL
 };
 static void conv_write(PurpleConversation *conv, const char *who, const char *alias, const char *msg, PurpleMessageFlags flags, time_t mtime) {
 	LOG4CXX_INFO(logger, "MSG");
 	if (flags & PURPLE_MESSAGE_SYSTEM && CONFIG_STRING(config, "service.protocol") == "prpl-telegram") {
 		PurpleAccount *account = purple_conversation_get_account_wrapped(conv);
 	// 	char *striped = purple_markup_strip_html_wrapped(message);
 	// 	std::string msg = striped;
 	// 	g_free(striped);
 		// Escape HTML characters.
 		char *newline = purple_strdup_withhtml_wrapped(msg);
 		char *strip, *xhtml;
 		purple_markup_html_to_xhtml_wrapped(newline, &xhtml, &strip);
 	// 	xhtml_linkified = spectrum_markup_linkify(xhtml);
 		std::string message_(strip);
 		std::string xhtml_(xhtml);
 		g_free(newline);
 		g_free(xhtml);
 	// 	g_free(xhtml_linkified);
 		g_free(strip);
 		// AIM and XMPP adds <body>...</body> here...
 		if (xhtml_.find("<body>") == 0) {
 			xhtml_ = xhtml_.substr(6);

0 comments (0 inline, 0 general)