libtransport.git Changeset - f91d406d54c6

Changeset - f91d406d54c6

Parent rev.

Child rev.

[Not reviewed]

libpurple_multilevel_disco

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

@@ @@ -773,53 +773,51 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 		std::string NameToLegacyName(PurpleAccount *account, const std::string &legacyName) {
 			std::string conversationName = legacyName;
 			BOOST_FOREACH(std::string _room, m_rooms[np->m_accounts[account]]) {
 				if (_room.compare(conversationName) == 0) {
 					conversationName = boost::locale::to_lower(legacyName);
 					break;
+				}
+			}
 			return conversationName;
+		}
 		void handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &pasword) {
 			PurpleAccount *account = m_sessions[user];
 			if (!account) {
 				return;
+			}
 			PurpleConnection *gc = purple_account_get_connection_wrapped(account);
 			GHashTable *comps = NULL;
 			std::string roomName = LegacyNameToName(account, room);
 			// Check if the PurpleChat is not stored in buddy list
 			PurpleChat *chat = purple_blist_find_chat_wrapped(account, roomName.c_str());
 			if (chat) {
 				LOG4CXX_INFO(logger, "CHAT FOUND");
 				comps = purple_chat_get_components_wrapped(chat);
+			}
 			else if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL) {
 				LOG4CXX_INFO(logger, "CHAT NOT FOUND");
 				if (CONFIG_STRING(config, "service.protocol") == "prpl-jabber") {
 					comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, (roomName + "/" + nickname).c_str());
+				}
 				else {
 					comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, roomName.c_str());
+				}
+			}
 			if (CONFIG_STRING(config, "service.protocol") != "prpl-jabber") {
                                np->handleParticipantChanged(np->m_accounts[account], nickname, room, 0, pbnetwork::STATUS_ONLINE);
                                const char *disp;
                                if ((disp = purple_account_get_name_for_display(account)) == NULL) {
                                        if ((disp = purple_connection_get_display_name(account->gc)) == NULL) {
                                                disp = purple_account_get_username(account);
+                                       }
+                               }
                                LOG4CXX_INFO(logger, user << ": Display name is " << disp << ", nickname is " << nickname);
                                if (nickname != disp) {
                                        handleRoomNicknameChanged(np->m_accounts[account], room, disp);
                                        np->handleParticipantChanged(np->m_accounts[account], nickname, room, 0, pbnetwork::STATUS_ONLINE, "", disp);
+                               }
+			}
 			LOG4CXX_INFO(logger, user << ": Joining the room " << roomName);

0 comments (0 inline, 0 general)