diff options
| author | George Hazan <ghazan@miranda.im> | 2021-03-26 16:48:53 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-03-26 16:48:53 +0300 |
| commit | 25c72306da694aefc53294c6ccd9e7e205229260 (patch) | |
| tree | 58ac71052d47771611ff23c110b5b6d6e34ff40c /protocols/IRCG/src/tools.cpp | |
| parent | 30fa813e97c0195cdbf02d92943c909904d5a197 (diff) | |
fixes #2798 (IRC: remove "Networks")
Diffstat (limited to 'protocols/IRCG/src/tools.cpp')
| -rw-r--r-- | protocols/IRCG/src/tools.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp index 02ca2c5b6d..e0ebfd64fe 100644 --- a/protocols/IRCG/src/tools.cpp +++ b/protocols/IRCG/src/tools.cpp @@ -373,10 +373,7 @@ INT_PTR CIrcProto::DoEvent(int iEvent, const wchar_t* pszWindow, const wchar_t* GCEVENT gce = { m_szModuleName, nullptr, iEvent };
if (pszWindow) {
- if (mir_wstrcmpi(pszWindow, SERVERWINDOW))
- sID = pszWindow + (CMStringW)L" - " + m_info.sNetwork;
- else
- sID = pszWindow;
+ sID = pszWindow;
gce.pszID.w = (wchar_t*)sID.c_str();
}
else gce.pszID.w = nullptr;
@@ -521,7 +518,7 @@ int CIrcProto::SetChannelSBText(CMStringW sWindow, CHANNELINFO * wi) CMStringW CIrcProto::MakeWndID(const wchar_t* sWindow)
{
wchar_t buf[200];
- mir_snwprintf(buf, L"%s - %s", sWindow, (IsConnected()) ? m_info.sNetwork.c_str() : TranslateT("Offline"));
+ mir_snwprintf(buf, L"%s - %s", sWindow, (IsConnected()) ? m_tszUserName : TranslateT("Offline"));
return CMStringW(buf);
}
@@ -670,12 +667,3 @@ void CIrcProto::ClearUserhostReasons(int type) break;
}
}
-
-////////////////////////////////////////////////////////////////////
-
-SERVER_INFO::~SERVER_INFO()
-{
- mir_free(m_name);
- mir_free(m_address);
- mir_free(m_group);
-}
|