diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-09 03:51:01 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-09 03:51:01 +0000 |
| commit | 1e2a5c427d6973fa3a5d7fd337fe8b50ed93c3f0 (patch) | |
| tree | c0d3f446d24cc243fe650dadfed1213176955fb9 /protocols/MRA | |
| parent | 6dd3d5ed1fc83c7118fa924d8932c6f742951d79 (diff) | |
MRA
Fix: Blog status extra icons and GetAwayMsg service for "on phone" contacts
git-svn-id: http://svn.miranda-ng.org/main/trunk@8486 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA')
| -rw-r--r-- | protocols/MRA/src/MraProto.cpp | 4 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_proto.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index c7c36cb1ba..49a418df6f 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -284,7 +284,7 @@ DWORD_PTR CMraProto::GetCaps(int type, MCONTACT hContact) return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_FREECHAT | PF2_ONTHEPHONE;
case PFLAGNUM_3:
- return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_FREECHAT;
+ return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_FREECHAT | PF2_ONTHEPHONE;
case PFLAGNUM_4:
return PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDUTF;
@@ -551,7 +551,7 @@ HANDLE CMraProto::GetAwayMsg(MCONTACT hContact) if (!m_bLoggedIn || ! hContact)
return 0;
- TCHAR szStatusDesc[MICBLOG_STATUS_MAX+MICBLOG_STATUS_MAX+MAX_PATH], szTime[64];
+ TCHAR szStatusDesc[MICBLOG_STATUS_MAX + MICBLOG_STATUS_MAX + MAX_PATH], szTime[64];
DWORD dwTime;
int iRet = 0;
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index b8b37f53d4..6dd55cb135 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -1270,7 +1270,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) mraWriteContactSettingBlob(hContact, DBSETTING_BLOGSTATUSID, &dwBlogStatusID.QuadPart, sizeof(DWORDLONG));
mraSetStringW(hContact, DBSETTING_BLOGSTATUS, wszBlogStatus);
mraSetStringW(hContact, DBSETTING_BLOGSTATUSMUSIC, wszBlogStatusMusic);
- if (IsXStatusValid(dwXStatus))
+ if (IsXStatusValid(dwXStatus) || wszBlogStatus.GetLength())
SetExtraIcons(hContact);
if (dwTemp != ID_STATUS_OFFLINE) { // пишем клиента только если юзер не отключён, иначе не затираем старое
@@ -1440,6 +1440,7 @@ bool CMraProto::CmdBlogStatus(BinBuffer &buf) mraWriteContactSettingBlob(hContact, DBSETTING_BLOGSTATUSID, &dwBlogStatusID, sizeof(DWORDLONG));
mraSetStringW(hContact, DBSETTING_BLOGSTATUS, wszText);
}
+ SetExtraIcons(hContact);
}
return true;
}
|