centralized system of processing message ids. also fixes #1375

2 files changed, 3 insertions, 6 deletions

diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index 7daad29062..09f123f0c4 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -26,14 +26,11 @@ int CSkypeProto::OnReceiveMessage(MCONTACT hContact, const char *szContent, cons
 	recv.timestamp = timestamp;

 	recv.szMessage = mir_strdup(szContent);

 	recv.lParam = emoteOffset;

+	recv.szMsgId = szMessageId;

 	if (isRead)

 		recv.flags |= PREF_CREATEREAD;

 

-	MEVENT hDbEvent = ProtoChainRecvMsg(hContact, &recv);

-	if (hDbEvent)

-		db_event_setId(m_szModuleName, hDbEvent, szMessageId);

-	

-	return hDbEvent;

+	return ProtoChainRecvMsg(hContact, &recv);

 }

 

 /* MESSAGE SENDING */

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index d0c2cdb495..fde09f0757 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -116,7 +116,7 @@ INT_PTR CSkypeProto::GetCaps(int type, MCONTACT)
 	case PFLAGNUM_3:
 		return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_HEAVYDND;
 	case PFLAGNUM_4:
-		return PF4_FORCEADDED | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDOFFLINE | PF4_OFFLINEFILES;
+		return PF4_FORCEADDED | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDOFFLINE | PF4_OFFLINEFILES | PF4_SERVERMSGID;
 	case PFLAG_UNIQUEIDTEXT:
 		return (INT_PTR)Translate("Skypename");
 	}