6 files changed, 14 insertions, 14 deletions
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 422026cdd1..35780ca621 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -719,7 +719,7 @@ void CVkProto::DBAddAuthRequest(const MCONTACT hContact, bool added)
 
 	DBEVENTINFO dbei = {};
 	dbei.szModule = m_szModuleName;
-	dbei.timestamp = (uint32_t)time(0);
+	dbei.iTimestamp = (uint32_t)time(0);
 	dbei.flags = DBEF_UTF;
 	dbei.eventType = added ? EVENTTYPE_ADDED : EVENTTYPE_AUTHREQUEST;
 	dbei.cbBlob = blob.size();
@@ -1962,7 +1962,7 @@ void CVkProto::AddVkDeactivateEvent(MCONTACT hContact, CMStringW&  wszType)
 
 	DBEVENTINFO dbei = {};
 	dbei.szModule = m_szModuleName;
-	dbei.timestamp = time(0);
+	dbei.iTimestamp = time(0);
 	dbei.eventType = VK_USER_DEACTIVATE_ACTION;
 	ptrA pszDescription(mir_utf8encode(vkDeactivateEvent[iDEIdx].szDescription));
 	dbei.cbBlob = (uint32_t)mir_strlen(pszDescription) + 1;
@@ -1995,7 +1995,7 @@ MEVENT CVkProto::GetMessageFromDb(const char *szMessageId, time_t& tTimeStamp, C
 
 	DB::EventInfo dbei(hDbEvent);
 	wszMsg = ptrW(mir_utf8decodeW((char*)dbei.pBlob));
-	tTimeStamp = dbei.timestamp;
+	tTimeStamp = dbei.getUnixtime();
 
 	return hDbEvent;
 }
@@ -2023,7 +2023,7 @@ bool CVkProto::IsMessageExist(VKMessageID_t iMessageId, VKMesType vkType)
 	if(db_event_get(hDbEvent, &dbei))
 		return false;
 
-	return ((vkType == vkOUT) == (bool)(dbei.flags & DBEF_SENT));
+	return ((vkType == vkOUT) == dbei.bSent);
 }
 
 CMStringW CVkProto::UserProfileUrl(VKUserID_t iUserId)
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 4f3ed443ba..979624a17d 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -577,7 +577,7 @@ void CVkProto::AppendChatMessage(CVkChatInfo* vkChatInfo, VKMessageID_t iMessage
 		
 		DB::EventInfo dbei;
 		dbei.szId = szMid;
-		dbei.timestamp = tMsgTime;
+		dbei.iTimestamp = tMsgTime;
 		dbei.pBlob = pszBody;
 		if (iUserId == m_iMyUserId)
 			dbei.flags |= DBEF_SENT;
diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index 33b4c3cd11..be05063ca0 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -56,7 +56,7 @@ void CVkProto::AddFeedEvent(CVKNewsItem& vkNewsItem)
 	T2Utf pszBody(vkNewsItem.wszText);
 
 	DB::EventInfo dbei;
-	dbei.timestamp = vkNewsItem.tDate;
+	dbei.iTimestamp = vkNewsItem.tDate;
 	dbei.pBlob = pszBody;
 
 	if (m_vkOptions.bUseNonStandardNotifications) {
@@ -868,7 +868,7 @@ void CVkProto::NewsClearHistory()
 	while (MEVENT hDbEvent = pCursor.FetchNext()) {
 		DBEVENTINFO dbei = {};
 		db_event_get(hDbEvent, &dbei);
-		if (dbei.timestamp < tTime)
+		if (dbei.getUnixtime() < tTime)
 			pCursor.DeleteEvent();
 	}
 }
 \ No newline at end of file
diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index a69883a117..23cbc6f821 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -116,7 +116,7 @@ void CVkProto::GetServerHistoryLastNDay(MCONTACT hContact, int iNDay)
 		while (MEVENT hDbEvent = pCursor.FetchNext()) {
 			DBEVENTINFO dbei = {};
 			db_event_get(hDbEvent, &dbei);
-			if (dbei.timestamp > tTime && dbei.eventType != VK_USER_DEACTIVATE_ACTION)
+			if (dbei.getUnixtime() > tTime && dbei.eventType != VK_USER_DEACTIVATE_ACTION)
 				pCursor.DeleteEvent();
 		}
 
@@ -322,7 +322,7 @@ void CVkProto::OnReceiveHistoryMessages(MHttpResponse *reply, AsyncHttpRequest *
 
 		T2Utf pszBody(wszBody);
 
-		dbei.timestamp = tDateTime;
+		dbei.iTimestamp = tDateTime;
 		dbei.pBlob = pszBody;
 		dbei.szId = szMid;
 
diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index 3af8146ed8..03f842609f 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -60,10 +60,10 @@ int CVkProto::ForwardMsg(MCONTACT hContact, std::vector<MEVENT>& vForvardEvents,
 			continue;
 
 		if (!Proto_IsProtoOnContact(dbei.hContact, m_szModuleName)) {
-			CMStringW wszContactName = (dbei.flags & DBEF_SENT) ? getWStringA(0, "Nick", TranslateT("Me")) : Clist_GetContactDisplayName(dbei.hContact);
+			CMStringW wszContactName = (dbei.bSent) ? getWStringA(0, "Nick", TranslateT("Me")) : Clist_GetContactDisplayName(dbei.hContact);
 
 			wchar_t ttime[64];
-			time_t  tTimestamp(dbei.timestamp);
+			time_t  tTimestamp(dbei.getUnixtime());
 			_locale_t locale = _create_locale(LC_ALL, "");
 			_wcsftime_l(ttime, _countof(ttime), TranslateT("%x at %X"), localtime(&tTimestamp), locale);
 			_free_locale(locale);
@@ -489,7 +489,7 @@ void CVkProto::OnReceiveMessages(MHttpResponse *reply, AsyncHttpRequest *pReq)
 			SetInvisible(hContact);
 
 		T2Utf pszBody(wszBody);
-		dbei.timestamp = bEdited ? tDateTime : (m_vkOptions.bUseLocalTime ? time(0) : tDateTime);
+		dbei.iTimestamp = bEdited ? tDateTime : (m_vkOptions.bUseLocalTime ? time(0) : tDateTime);
 		dbei.pBlob = pszBody;
 		
 		if (!m_vkOptions.bShowReplyInMessage && szReplyId) {
@@ -518,7 +518,7 @@ void CVkProto::OnReceiveMessages(MHttpResponse *reply, AsyncHttpRequest *pReq)
 			debugLogA("CVkProto::OnReceiveMessages add attachments");
 
 			T2Utf pszAttach(wszAttachmentDescr);
-			dbei.timestamp = isOut ? time(0) : tDateTime;
+			dbei.iTimestamp = isOut ? time(0) : tDateTime;
 			dbei.pBlob = pszAttach;
 			dbei.szId = strcat(szMid, "_");
 			ProtoChainRecvMsg(hContact, dbei);
diff --git a/protocols/VKontakte/src/vk_pollserver.cpp b/protocols/VKontakte/src/vk_pollserver.cpp
index adb4ee0580..f462df0d7b 100644
--- a/protocols/VKontakte/src/vk_pollserver.cpp
+++ b/protocols/VKontakte/src/vk_pollserver.cpp
@@ -143,7 +143,7 @@ void CVkProto::PollUpdates(const JSONNode &jnUpdates)
 				_itoa(iMessageId, szMid, 10);
 
 				T2Utf pszMsg(wszMsg);
-				dbei.timestamp = tDateTime;
+				dbei.iTimestamp = tDateTime;
 				dbei.pBlob = pszMsg;
 				dbei.szId = szMid;
 				ProtoChainRecvMsg(hContact, dbei);