diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/MRA/src/MraSendCommand.cpp | 5 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_functions.cpp | 1 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_svcs.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/protocols/MRA/src/MraSendCommand.cpp b/protocols/MRA/src/MraSendCommand.cpp index 8e26f28364..2f9d5f8db4 100644 --- a/protocols/MRA/src/MraSendCommand.cpp +++ b/protocols/MRA/src/MraSendCommand.cpp @@ -237,7 +237,10 @@ DWORD CMraProto::MraModifyContact(MCONTACT hContact, DWORD *pdwID, DWORD *pdwCon buf.SetUL(dwID);
buf.SetUL(dwContactFlag | CONTACT_FLAG_UNICODE_NAME);
buf.SetUL(dwGroupID);
- buf.SetLPSLowerCase(szEmail);
+ if (hContact)
+ buf.SetLPSLowerCase(szEmail);
+ else
+ buf.SetLPSW(wszCustomName);
buf.SetLPSW(wszCustomName);
buf.SetLPS(szPhones);
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index d3d6886d38..d6ca2c6574 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -867,6 +867,7 @@ void CMraProto::ShowFormattedErrorMessage(LPWSTR lpwszErrText, DWORD dwErrorCode szErrDescription[dwErrDescriptionSize] = 0;
mir_snwprintf(szErrorText, L"%s %lu: %s", TranslateW(lpwszErrText), dwErrorCode, szErrDescription);
}
+ debugLogA("Error happened: %S", szErrorText);
MraPopupShowFromAgentW(MRA_POPUP_TYPE_ERROR, szErrorText);
}
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index 7f8405ebd0..dc40f9f915 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -641,10 +641,12 @@ int CMraProto::OnGroupChanged(WPARAM hContact, LPARAM lParam) if (cgc->pszOldName == nullptr)
return 0;
+ debugLogA("removing group %S", cgc->pszOldName);
MraGroupItem *pGrp = nullptr;
for (auto &it : m_groups) {
if (!mir_wstrcmp(it->m_name, cgc->pszOldName)) {
pGrp = it;
+ debugLogA("found a group at the server, idx = %d", it->m_id);
break;
}
}
|