From 401deee43baac1b0102438b414501188e39dd7ff 2017-11-06 18:54:27
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: 2017-11-06 18:54:27
Subject: [PATCH] libpurple: prefer purple_account_get_name_for_display over purple_connection_get_display_name

---

diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
index 08e8069e53fc12b8f13029498c3cbd89fd71ea48..e0768a34a1c647639b571570834af2adb06fc8a3 100644
--- a/backends/libpurple/main.cpp
+++ b/backends/libpurple/main.cpp
@@ -780,17 +780,18 @@ 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)) == 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);
-				}
+                               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);