libtransport.git Changeset - d3bae007bc49

Changeset - d3bae007bc49

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Florian Kinder - 7 years ago 2018-12-01 10:25:50
florian.kinder@fankserver.com

Removed debug stuff

1 file changed with 0 insertions and 2 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

 	while (l != NULL) {
 		std::string name((char *) l->data);
 		std::string conversationName = purple_conversation_get_name_wrapped(conv);
 		np->handleParticipantChanged(np->m_accounts[account], name, np->NameToLegacyName(account, conversationName), 0, pbnetwork::STATUS_NONE);
 		l = l->next;
+	}
+}
 static gboolean conv_has_focus(PurpleConversation *conv) {
 	return TRUE;
+}
 static void conv_chat_topic_changed(PurpleConversation *conv, const char *who, const char *topic) {
 	LOG4CXX_INFO(logger, "Conversation topic changed");
 	PurpleAccount *account = purple_conversation_get_account_wrapped(conv);
 	np->handleSubject(np->m_accounts[account], np->NameToLegacyName(account, purple_conversation_get_name_wrapped(conv)), topic ? topic : "", who ? who : "Spectrum 2");
+}
 static void conv_present(PurpleConversation *conv) {
 	if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_CHAT) {
 		LOG4CXX_INFO(logger, "Conversation presented");
 		conv_chat_add_users(conv, PURPLE_CONV_CHAT_WRAPPED(conv)->in_room, TRUE);
 		const char *topic = purple_conv_chat_get_topic(PURPLE_CONV_CHAT_WRAPPED(conv));
 		LOG4CXX_INFO(logger, "topic: " << topic);
 		if (topic && *topic != '\0') {
 			conv_chat_topic_changed(conv, topic, PURPLE_CONV_CHAT_WRAPPED(conv)->who);
+		}
 		else {
 			LOG4CXX_INFO(logger, "Conversation created with an empty topic");
+		}
+	}
+}
 static PurpleConversationUiOps conversation_ui_ops =
+{
 	NULL,
 	NULL,
 	conv_write_im,//conv_write_chat,                              /* write_chat           */
 	conv_write_im,             /* write_im             */
 	conv_write,//conv_write_conv,           /* write_conv           */
 	conv_chat_add_users,       /* chat_add_users       */
 	NULL,//conv_chat_rename_user,     /* chat_rename_user     */
 	conv_chat_remove_users,    /* chat_remove_users    */
 	NULL,//pidgin_conv_chat_update_user,     /* chat_update_user     */
 	conv_present,//pidgin_conv_present_conversation, /* present              */
 	conv_has_focus,//pidgin_conv_has_focus,            /* has_focus            */
 	NULL,//pidgin_conv_custom_smiley_add,    /* custom_smiley_add    */
 	NULL,//pidgin_conv_custom_smiley_write,  /* custom_smiley_write  */
 		GList *rooms;
 		std::list<std::string> m_topics;
 		PurplePlugin *plugin = purple_find_prpl_wrapped(purple_account_get_protocol_id_wrapped(list->account));
 		PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 		for (rooms = list->rooms; rooms != NULL; rooms = rooms->next) {
 			PurpleRoomlistRoom *room = (PurpleRoomlistRoom *)rooms->data;
 			std::string roomIdentifier = room->name;
 			if (roomId != -1) {
 				char *roomIdField = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), roomId);
 				if (roomIdField) {
 					roomIdentifier = std::string(roomIdField);
+				}
+			}
 			np->m_rooms[np->m_accounts[list->account]].push_back(roomIdentifier);
 			std::string roomName = "";
 			int nestedLevel = 0;
 			PurpleRoomlistRoom *parentRoom = purple_roomlist_room_get_parent(room);
 			while (parentRoom != NULL) {
 				nestedLevel++;
 				parentRoom = purple_roomlist_room_get_parent(parentRoom);
+			}
 			LOG4CXX_INFO(logger, "nestedLevel " << nestedLevel);
 			if (nestedLevel > 0) {
 				std::string roomNamePrefix = std::string(nestedLevel, '-');
 				if (roomNamePrefix != "") {
 					roomNamePrefix = roomNamePrefix + "> ";
+				}
 				roomName = roomNamePrefix;
+			}
 			if (topicId == -1) {
 				roomName += room->name;
+			}
 			else {
 				char *topic = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), topicId);
 				if (topic) {
 					roomName += topic;
+				}
 				else if (usersId) {
 					char *users = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), usersId);
 					if (users) {
 						roomName += users;
+					}
 					else {
 						LOG4CXX_WARN(logger, "RoomList topic and users is NULL");

0 comments (0 inline, 0 general)