simpler way of applying server ids to messages

3 files changed, 17 insertions, 19 deletions

diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp
index c5b3aa348c..8a0869ab04 100644
--- a/protocols/SkypeWeb/src/skype_db.cpp
+++ b/protocols/SkypeWeb/src/skype_db.cpp
@@ -43,10 +43,15 @@ MEVENT CSkypeProto::AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DW
 	if (MEVENT hDbEvent = GetMessageFromDb(uid))
 		return hDbEvent;
 
-	MEVENT ret = AddEventToDb(hContact, type, timestamp, flags, (DWORD)mir_strlen(content)+1, (BYTE*)content);
-	if (uid && ret)
-		db_event_setId(m_szModuleName, ret, uid);
-	return ret;
+	DBEVENTINFO dbei = {};
+	dbei.szModule = m_szModuleName;
+	dbei.timestamp = timestamp;
+	dbei.eventType = type;
+	dbei.cbBlob = (DWORD)mir_strlen(content) + 1;
+	dbei.pBlob = (BYTE *)content;
+	dbei.flags = flags;
+	dbei.szId = uid;
+	return db_event_add(hContact, &dbei);
 }
 
 void CSkypeProto::EditEvent(MCONTACT hContact, MEVENT hEvent, const char *szContent, time_t edit_time)
@@ -92,18 +97,6 @@ void CSkypeProto::EditEvent(MCONTACT hContact, MEVENT hEvent, const char *szCont
 	db_event_edit(hContact, hEvent, &dbei);
 }
 
-MEVENT CSkypeProto::AddEventToDb(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, DWORD cbBlob, PBYTE pBlob)
-{
-	DBEVENTINFO dbei = {};
-	dbei.szModule = m_szModuleName;
-	dbei.timestamp = timestamp;
-	dbei.eventType = type;
-	dbei.cbBlob = cbBlob;
-	dbei.pBlob = pBlob;
-	dbei.flags = flags;
-	return db_event_add(hContact, &dbei);
-}
-
 void CSkypeProto::InitDBEvents()
 {
 	db_set_resident(m_szModuleName, "LastAuthRequestTime");
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 7a0bb990b5..e590729a4e 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -317,9 +317,15 @@ int CSkypeProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 
 	// memcpy(pCurBlob + 1, szMessageId, mir_strlen(szMessageId));
 
-	AddEventToDb(hContact, EVENTTYPE_CONTACTS, pre->timestamp, (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0, cbBlob, pBlob);
+	DBEVENTINFO dbei = {};
+	dbei.szModule = m_szModuleName;
+	dbei.timestamp = pre->timestamp;
+	dbei.eventType = EVENTTYPE_CONTACTS;
+	dbei.cbBlob = cbBlob;
+	dbei.pBlob = pBlob;
+	dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0;
+	db_event_add(hContact, &dbei);
 
 	mir_free(pBlob);
-
 	return 0;
 }
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 8a9a243afe..52a8e04cc9 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -320,7 +320,6 @@ private:
 	{	return (!mir_strcmpi(str, m_szMyname) || !mir_strcmp(str, ptrA(getStringA("SelfEndpointName"))));

 	}

 

-	MEVENT AddEventToDb(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, DWORD cbBlob, PBYTE pBlob);

 	static time_t IsoToUnixTime(const char *stamp);

 	static CMStringA GetStringChunk(const char *haystack, const char *start, const char *end);