libtransport.git Changeset - de8114d2da06

Changeset - de8114d2da06

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 9 years ago 2016-02-09 08:01:04
jkaluza@redhat.com

Libpurple: Do not change the nickname when joining the room when it is the same as the one used by the user

3 files changed with 6 insertions and 6 deletions:

backends/libpurple/main.cpp

libtransport/Conversation.cpp

tests/libtransport/localbuddy.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -710,14 +710,14 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 			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_connection_get_display_name(account->gc))) {
 				if ((disp = purple_connection_get_display_name(account->gc)) == NULL) {
 					disp = purple_account_get_username(account);
+				}
 				if (nickname != disp) {
 					handleRoomNicknameChanged(np->m_accounts[account], room, disp);
 					np->handleParticipantChanged(np->m_accounts[account], nickname, room, 0, pbnetwork::STATUS_ONLINE, "", disp);
+				}
 				else {
 					handleRoomNicknameChanged(np->m_accounts[account], room, purple_account_get_username(account));
 					np->handleParticipantChanged(np->m_accounts[account], nickname, room, 0, pbnetwork::STATUS_ONLINE, "", purple_account_get_username(account));
+				}
+			}
 			LOG4CXX_INFO(logger, user << ": Joining the room " << room);

libtransport/Conversation.cpp

➞

Show inline comments

 				Swift::MUCUserPayload::StatusCode c;
 				c.code = 210;
 				p->addStatusCode(c);
 				m_nicknameChanged = false;
+			}
 			m_sentInitialPresence = true;
+		}

tests/libtransport/localbuddy.cpp

➞

Show inline comments

 		received.clear();
 		buddy->setStatus(Swift::StatusShow(Swift::StatusShow::None), "");
 		dumpReceived();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::None, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getShow());

0 comments (0 inline, 0 general)