diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-18 15:11:18 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-18 15:11:18 +0300 |
| commit | e8d74f6fa82f2489926c228d2e5790928174afce (patch) | |
| tree | 3377ae5084c9e7e2c31e82d1e93cf7f33304a9e1 /protocols | |
| parent | 50247adeede21cdf997212e48bebe3514d15afca (diff) | |
fixes #3433 (Jabber: не работает хайлайт по нику из закладок)
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_bookmarks.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_groupchat.cpp | 6 | ||||
| -rw-r--r-- | 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);
}
}
}
|