diff options
| author | Robert Pösel <robyer@seznam.cz> | 2017-03-18 20:47:27 +0100 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2017-03-18 20:54:46 +0100 |
| commit | 46cb46859ce27e2d23da0bcbecbe92da7b349b26 (patch) | |
| tree | 0aba9bfa45001505ffd45f0aaf3617438c34e7bb | |
| parent | b7cd9afaf2720ac058da19c6398f40f894ba1b88 (diff) | |
SkypeWeb: Revert my invalid attempts related to #608
* reverted commit b225a055f5d3abc754899d115582f39cc2168f3f
* reverted commit 88cb4210be8c51a6fb567216bb87d2d6cf7826f8
| -rw-r--r-- | protocols/SkypeWeb/src/skype_db.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp index c2bf039e9c..2dbe2ced90 100644 --- a/protocols/SkypeWeb/src/skype_db.cpp +++ b/protocols/SkypeWeb/src/skype_db.cpp @@ -68,7 +68,7 @@ MEVENT CSkypeProto::AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DW return hDbEvent; size_t messageLength = mir_strlen(content) + 1; size_t messageIdLength = mir_strlen(uid); - size_t cbBlob = messageLength + messageIdLength + 1; + size_t cbBlob = messageLength + messageIdLength; PBYTE pBlob = (PBYTE)mir_alloc(cbBlob); memcpy(pBlob, content, messageLength); memcpy(pBlob + messageLength, uid, messageIdLength); @@ -128,11 +128,7 @@ MEVENT CSkypeProto::AppendDBEvent(MCONTACT hContact, MEVENT hEvent, const char * } - // First force old event to be read, so it won't be stuck forever because of theoretical bug in DB driver - db_event_markRead(hContact, hEvent); - // Only then delete the original event - db_event_delete(hContact, hEvent); - // Finally add new edited event, but with original event's properties (including flags) + db_event_delete(hContact, hEvent); return AddDbEvent(SKYPE_DB_EVENT_TYPE_EDITED_MESSAGE, hContact, dbei.timestamp, dbei.flags, jMsg.write().c_str(), szUid); } |