diff options
author | George Hazan <ghazan@miranda.im> | 2021-03-27 12:45:28 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2021-03-27 12:45:28 +0300 |
commit | fe9692f49580dcefa033524caf19e04ab074da19 (patch) | |
tree | ffaf28439363829b96a3502dea0728015d2d4951 /protocols/IRCG/src/services.cpp | |
parent | 729c3fb4042bf334c94eff81aea4b45ce21719b1 (diff) |
IRCG:
- fixes #2810 (own messages are invisible);
- fixes #2809 (Perform on Event' broken);
- code cleaning
Diffstat (limited to 'protocols/IRCG/src/services.cpp')
-rw-r--r-- | protocols/IRCG/src/services.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 2e7cf56bfb..17562e9c72 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -177,7 +177,7 @@ void CIrcProto::OnContactDeleted(MCONTACT hContact) if (type != 0) {
CMStringW S;
if (type == GCW_CHATROOM)
- S = MakeWndID(dbv.pwszVal);
+ S = dbv.pwszVal;
if (type == GCW_SERVER)
S = SERVERWINDOW;
int i = Chat_Terminate(m_szModuleName, S);
@@ -220,7 +220,7 @@ INT_PTR __cdecl CIrcProto::OnLeaveChat(WPARAM wp, LPARAM) if (!getWString((MCONTACT)wp, "Nick", &dbv)) {
if (getByte((MCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM) {
PostIrcMessage(L"/PART %s %s", dbv.pwszVal, m_userInfo);
- Chat_Terminate(m_szModuleName, MakeWndID(dbv.pwszVal));
+ Chat_Terminate(m_szModuleName, dbv.pwszVal);
}
db_free(&dbv);
}
@@ -477,7 +477,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM, LPARAM lParam) case 3:
PostIrcMessage(L"/PART %s %s", p1, m_userInfo);
- Chat_Terminate(m_szModuleName, MakeWndID(p1));
+ Chat_Terminate(m_szModuleName, p1);
break;
case 4: // show server window
@@ -976,7 +976,7 @@ void CIrcProto::ConnectToServer(void) InterlockedIncrement((long *)&m_bConnectRequested);
wchar_t szTemp[300];
- mir_snwprintf(szTemp, L"\033%s %S:%u", TranslateT("Connecting to"), m_sessionInfo.sServer.c_str(), m_sessionInfo.iPort);
+ mir_snwprintf(szTemp, L"\033%s %c%s%c (%S: %u)", TranslateT("Connecting to"), irc::BOLD, m_tszUserName, irc::BOLD, m_sessionInfo.sServer.c_str(), m_sessionInfo.iPort);
DoEvent(GC_EVENT_INFORMATION, SERVERWINDOW, nullptr, szTemp, nullptr, nullptr, NULL, true, false);
}
|