summaryrefslogtreecommitdiff
path: root/protocols/IcqOscarJ/src/icq_proto.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/IcqOscarJ/src/icq_proto.cpp')
-rw-r--r--protocols/IcqOscarJ/src/icq_proto.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index fcaa00b512..fb9a2928d6 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -1505,12 +1505,6 @@ int __cdecl CIcqProto::SetStatus(int iNewStatus)
// New status is OFFLINE
if (nNewStatus == ID_STATUS_OFFLINE) { // for quick logoff
- if (icqOnline()) { // set offline status note (otherwise the old will remain)
- char *szOfflineNote = PrepareStatusNote(nNewStatus);
- SetStatusNote(szOfflineNote, 0, FALSE);
- SAFE_FREE(&szOfflineNote);
- }
-
m_iDesiredStatus = nNewStatus;
if (hServerConn) { // Connected, Send disconnect packet
@@ -1563,11 +1557,6 @@ int __cdecl CIcqProto::SetStatus(int iNewStatus)
char *szStatusNote = PrepareStatusNote(nNewStatus);
- //! This is a bit tricky, we do trigger status note change thread and then
- // change the status note right away (this spares one packet) - so SetStatusNote()
- // will only change User Details Directory
- SetStatusNote(szStatusNote, 6000, FALSE);
-
if (m_iStatus == ID_STATUS_INVISIBLE) {
if (m_bSsiEnabled)
updateServVisibilityCode(3);
@@ -1741,15 +1730,8 @@ int __cdecl CIcqProto::SetAwayMsg(int status, const wchar_t* msg)
*ppszMsg = szNewUtf;
szNewUtf = nullptr;
- if ((m_iStatus == status) && icqOnline()) { // update current status note
- char *szNote = *ppszMsg ? *ppszMsg : "";
-
- BYTE bXStatus = getContactXStatus(NULL);
- if (!bXStatus)
- SetStatusNote(szNote, 1000, FALSE);
-
+ if ((m_iStatus == status) && icqOnline()) // update current status note
icq_sendSetAimAwayMsgServ(*ppszMsg);
- }
}
SAFE_FREE(&szNewUtf);