diff options
| -rw-r--r-- | protocols/IcqOscarJ/src/fam_01service.cpp | 3 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/fam_03buddy.cpp | 4 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_proto.cpp | 15 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_proto.h | 2 |
4 files changed, 1 insertions, 23 deletions
diff --git a/protocols/IcqOscarJ/src/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp index f78f6213fb..a7c45d0e1c 100644 --- a/protocols/IcqOscarJ/src/fam_01service.cpp +++ b/protocols/IcqOscarJ/src/fam_01service.cpp @@ -310,9 +310,6 @@ void CIcqProto::handleServiceFam(BYTE *pBuffer, WORD wBufferLength, snac_header if (!m_bSsiEnabled || info->isMigrating)
handleServUINSettings(wListenPort, info);
}
- else if (m_hNotifyNameInfoEvent)
- // Just notify that the set status note & mood process is finished
- SetEvent(m_hNotifyNameInfoEvent);
}
break;
diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp index a6b28d2d8f..020c8af1eb 100644 --- a/protocols/IcqOscarJ/src/fam_03buddy.cpp +++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp @@ -195,10 +195,6 @@ void CIcqProto::handleUserOnline(BYTE *buf, WORD wLen, serverthread_info *info) unpackWord(&buf, &wTLVCount);
wLen -= 2;
- // notify that the set status note & mood process is finished
- if (m_hNotifyNameInfoEvent)
- SetEvent(m_hNotifyNameInfoEvent);
-
// Ignore status notification if the user is not already on our list
HANDLE hContact = HContactFromUID(dwUIN, szUID, NULL);
if (hContact == INVALID_HANDLE_VALUE)
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 95ba89e838..f25d21827a 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -1897,21 +1897,8 @@ int __cdecl CIcqProto::SetStatus(int iNewStatus) if (icqOnline())
{ // set offline status note (otherwise the old will remain)
char *szOfflineNote = PrepareStatusNote(nNewStatus);
-
- // Create unnamed event to wait until the status note change process is completed
- m_hNotifyNameInfoEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-
- int bNoteChanged = SetStatusNote(szOfflineNote, 0, FALSE);
-
+ SetStatusNote(szOfflineNote, 0, FALSE);
SAFE_FREE(&szOfflineNote);
-
- // Note was changed, wait until the process is over
- if (bNoteChanged)
- ICQWaitForSingleObject(m_hNotifyNameInfoEvent, 4000, TRUE);
-
- // Release the event
- CloseHandle(m_hNotifyNameInfoEvent);
- m_hNotifyNameInfoEvent = NULL;
}
m_iDesiredStatus = nNewStatus;
diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h index 024a2eb1ab..5b322f929d 100644 --- a/protocols/IcqOscarJ/src/icq_proto.h +++ b/protocols/IcqOscarJ/src/icq_proto.h @@ -270,8 +270,6 @@ struct CIcqProto : public PROTO_INTERFACE void icq_sendXtrazResponseDirect(HANDLE hContact, WORD wCookie, char* szBody, int nBodyLen, WORD wType);
//----| fam_01service.cpp |-----------------------------------------------------------
- HANDLE m_hNotifyNameInfoEvent;
-
void handleServiceFam(BYTE *pBuffer, WORD wBufferLength, snac_header *pSnacHeader, serverthread_info *info);
char* buildUinList(int subtype, WORD wMaxLen, HANDLE *hContactResume);
void sendEntireListServ(WORD wFamily, WORD wSubtype, int listType);
|