diff options
Diffstat (limited to 'protocols/IRCG/src/input.cpp')
| -rw-r--r-- | protocols/IRCG/src/input.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index fe5f53ebde..c43e7a1e84 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -170,6 +170,7 @@ CMStringW CIrcProto::DoIdentifiers(CMStringW text, const wchar_t*) text.Replace(L"%module", _A2T(m_szModuleName));
text.Replace(L"%name", m_name);
text.Replace(L"%newl", L"\r\n");
+ text.Replace(L"%network", _A2T(m_szModuleName));
text.Replace(L"%me", m_info.sNick.c_str());
char mirver[100];
@@ -240,12 +241,9 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo if (one == L"server")
S = SERVERWINDOW;
else
- S = MakeWndID(one.c_str());
+ S = one;
}
- else if (mir_wstrcmpi(window, SERVERWINDOW) == 0)
- S = window;
- else
- S = MakeWndID(window);
+ else S = window;
Chat_Control(m_szModuleName, S, WINDOW_CLEARLOG);
return true;
@@ -293,7 +291,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo CMStringW szNetwork;
if (three.IsEmpty())
- szNetwork = "IRC";
+ szNetwork = m_szModuleName;
else
szNetwork = three;
@@ -358,11 +356,10 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo if (command == L"/nusers") {
wchar_t szTemp[40];
- CMStringW S = MakeWndID(window);
GC_INFO gci = { 0 };
gci.Flags = GCF_BYID | GCF_NAME | GCF_COUNT;
gci.pszModule = m_szModuleName;
- gci.pszID = S.c_str();
+ gci.pszID = window;
if (!Chat_GetInfo(&gci))
mir_snwprintf(szTemp, L"users: %u", gci.iCount);
@@ -469,7 +466,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo return true;
}
- Chat_Terminate(m_szModuleName, MakeWndID(window));
+ Chat_Terminate(m_szModuleName, window);
PostIrcMessage(L"/JOIN %s", GetWordAddress(text, 1));
return true;
|