diff options
| author | George Hazan <ghazan@miranda.im> | 2019-04-02 19:17:32 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-04-02 19:17:32 +0300 |
| commit | c78da653c2806e0ac72e0c7baa499342a4c637e5 (patch) | |
| tree | 698ad0ca1188ed901aa13219885aa24a61b47cf8 /protocols | |
| parent | d788b07db648f5b435e552943cdd5a7b20a4ea3c (diff) | |
merge with trunk
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_adhoc.cpp | 6 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp index 65fd559948..66a0ac71ef 100644 --- a/protocols/JabberG/src/jabber_adhoc.cpp +++ b/protocols/JabberG/src/jabber_adhoc.cpp @@ -93,12 +93,12 @@ static void JabberAdHoc_RefreshFrameScroll(HWND hwndDlg, JabberAdHocData * dat) void CJabberProto::OnIqResult_ListOfCommands(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)
{
- SendMessage(GetWindowFromIq(pInfo), JAHM_COMMANDLISTRESULT, 0, (LPARAM)iqNode->DeepClone(0));
+ SendMessage(GetWindowFromIq(pInfo), JAHM_COMMANDLISTRESULT, 0, (LPARAM)iqNode);
}
void CJabberProto::OnIqResult_CommandExecution(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)
{
- SendMessage(GetWindowFromIq(pInfo), JAHM_PROCESSRESULT, (WPARAM)iqNode->DeepClone(0), 0);
+ SendMessage(GetWindowFromIq(pInfo), JAHM_PROCESSRESULT, 0, (WPARAM)iqNode);
}
void CJabberProto::AdHoc_RequestListOfCommands(char *szResponder, HWND hwndDlg)
@@ -417,7 +417,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA return dat->proto->AdHoc_OnJAHMCommandListResult(hwndDlg, (TiXmlElement*)lParam, dat);
case JAHM_PROCESSRESULT:
- return dat->proto->AdHoc_OnJAHMProcessResult(hwndDlg, (TiXmlElement*)wParam, dat);
+ return dat->proto->AdHoc_OnJAHMProcessResult(hwndDlg, (TiXmlElement*)lParam, dat);
case WM_MOUSEWHEEL:
{
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 985be14ea9..0eaf3012df 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -222,7 +222,7 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus }
if (name)
- buf.Format(Translate("Role of %s was changed to '%s'."), user->m_szResourceName, name);
+ buf.Format(TranslateU("Role of %s was changed to '%s'."), user->m_szResourceName, name);
}
break;
}
|