modified: messages.cpp

	modified:   utilities.cpp
	modified:   utilities.h

1 files changed, 12 insertions, 8 deletions

diff --git a/utilities.cpp b/utilities.cpp
index c8dc2ae..91ea9fb 100644
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -201,7 +201,7 @@ int SendKey(WPARAM w, LPARAM l)
 		BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
 		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
 		CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)szMessage);
-		HistoryLog(hContact, "Public key sent", EVENTTYPE_MESSAGE, DBEF_SENT);
+		HistoryLog(hContact, db_event("Public key sent", 0, 0, DBEF_SENT));
 		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
 	}
 	mir_free(szMessage);
@@ -586,16 +586,19 @@ void storeOutput(HANDLE ahandle, string *output)
 	} while (available>0);
 }
 
-void HistoryLog(HANDLE hContact, char *data, int event_type, int flags)
+void HistoryLog(HANDLE hContact, db_event evt)
 {
 	DBEVENTINFO Event = {0};
 	Event.cbSize = sizeof(Event);
 	Event.szModule = szGPGModuleName;
-	Event.eventType = event_type;
-	Event.flags = flags;
-	Event.timestamp = (DWORD)time(NULL);
-	Event.cbBlob = strlen(data)+1;
-	Event.pBlob = (PBYTE)_strdup(data);
+	Event.eventType = evt.eventType;
+	Event.flags = evt.flags;
+	if(!evt.timestamp)
+		Event.timestamp = (DWORD)time(NULL);
+	else
+		Event.timestamp = evt.timestamp;
+	Event.cbBlob = strlen((char*)evt.pBlob)+1;
+	Event.pBlob = (PBYTE)_strdup((char*)evt.pBlob);
 	CallService(MS_DB_EVENT_ADD, (WPARAM)(HANDLE)hContact,(LPARAM)&Event);
 }
 
@@ -1154,7 +1157,8 @@ void send_encrypted_msgs_thread(HANDLE hContact)
 			for(list<string>::iterator p = hcontact_data[hContact].msgs_to_send.begin(); p != end; ++p)
 			{
 				CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)p->c_str());
-				HistoryLog(hContact, (char*)p->c_str(), EVENTTYPE_MESSAGE, DBEF_SENT);
+				
+				HistoryLog(hContact, db_event((char*)p->c_str(),0,0, DBEF_SENT));
 				boost::this_thread::sleep(boost::posix_time::seconds(1));
 			}
 			return;