From e8d74f6fa82f2489926c228d2e5790928174afce Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 18 Mar 2023 15:11:18 +0300
Subject: =?UTF-8?q?fixes=20#3433=20(Jabber:=20=D0=BD=D0=B5=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D1=85=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B9=D1=82=20=D0=BF=D0=BE=20=D0=BD=D0=B8=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=B7=D0=B0=D0=BA=D0=BB=D0=B0=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/JabberG/src/jabber_bookmarks.cpp | 2 +-
 protocols/JabberG/src/jabber_chat.cpp      | 4 ++--
 protocols/JabberG/src/jabber_groupchat.cpp | 6 +++---
 protocols/JabberG/src/jabber_iqid.cpp      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 8fba42a1aa..4c06e9c6ca 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -393,7 +393,7 @@ public:
 				if (item->nick && *item->nick)
 					m_proto->GroupchatJoinRoom(server, room, item->nick, item->password);
 				else
-					m_proto->GroupchatJoinRoom(server, room, m_proto->MyNick(), item->password);
+					m_proto->GroupchatJoinRoom(server, room, m_proto->MyNick(item->hContact), item->password);
 			}
 		}
 		else Utils_OpenUrlW(Utf2T(item->jid));
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 42d98300aa..bc9d98cc76 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -262,7 +262,7 @@ void CJabberProto::GcLogUpdateMemberStatus(JABBER_LIST_ITEM *item, const char *r
 		break;
 	
 	default:
-		CMStringA myNick(MyNick());
+		CMStringA myNick(MyNick(item->hContact));
 		mir_cslock lck(m_csLists);
 		for (auto &JS : item->arResources) {
 			if (!mir_strcmp(resource, JS->m_szResourceName)) {
@@ -311,7 +311,7 @@ void CJabberProto::GcQuit(JABBER_LIST_ITEM *item, int code, const TiXmlElement *
 			szMessage = TranslateU(JABBER_GC_MSG_QUIT);
 	}
 	else {
-		CMStringA myNick(MyNick());
+		CMStringA myNick(MyNick(item->hContact));
 		GcLogUpdateMemberStatus(item, myNick, myNick, nullptr, GC_EVENT_KICK, reason);
 	}
 
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 2039f4f253..82147b8d1a 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -1143,10 +1143,10 @@ void CJabberProto::GroupchatProcessInvite(const char *roomJid, const char *from,
 	if (ListGetItemPtr(LIST_CHATROOM, roomJid))
 		return;
 
-	if (m_bAutoAcceptMUC) {
+	if (m_bAutoAcceptMUC)
 		AcceptGroupchatInvite(roomJid, MyNick(), password);
-	}
-	else CallFunctionAsync(sttShowDialog, new CGroupchatInviteAcceptDlg(this, roomJid, from, reason, password));
+	else
+		CallFunctionAsync(sttShowDialog, new CGroupchatInviteAcceptDlg(this, roomJid, from, reason, password));
 }
 
 void CJabberProto::AcceptGroupchatInvite(const char *roomJid, const char *reason, const char *password)
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 1498dad982..0aafde4364 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -230,7 +230,7 @@ void CJabberProto::OnProcessLoginRq(ThreadData *info, uint32_t rq)
 				if (item->nick && item->nick[0])
 					GroupchatJoinRoom(server, p, item->nick, item->password, true);
 				else {
-					GroupchatJoinRoom(server, p, MyNick(), item->password, true);
+					GroupchatJoinRoom(server, p, MyNick(item->hContact), item->password, true);
 				}
 			}
 		}
-- 
cgit v1.2.3