# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1188720054 0
# Node ID de0ae9a3eee2d6b5c801a6e5f56127750f314f43
# Parent  60fc9cadbd9240159c292f40ec8cd6a550d108bf# Parent  94a2a1ccd6ece41ba72c702541f9708e0a0d1f2c
merge of '67ad9f243a5d108c552110366d15b0e921e0c681'
     and 'eec0eedd7a4133ae0c0a9d952b8d507369bbc36f'

diff -r 60fc9cadbd92 -r de0ae9a3eee2 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Sun Sep 02 00:05:55 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Sun Sep 02 08:00:54 2007 +0000
@@ -683,6 +683,7 @@
 msim_incoming_im(MsimSession *session, MsimMessage *msg)
 {
 	gchar *username, *msg_msim_markup, *msg_purple_markup;
+	time_t time_received;
 
 	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
@@ -696,8 +697,12 @@
 	msg_purple_markup = msim_markup_to_html(session, msg_msim_markup);
 	g_free(msg_msim_markup);
 
-	serv_got_im(session->gc, username, msg_purple_markup, 
-			PURPLE_MESSAGE_RECV, time(NULL));
+	time_received = msim_msg_get_integer(msg, "date");
+	if (!time_received) {
+		time_received = time(NULL);
+	}
+
+	serv_got_im(session->gc, username, msg_purple_markup, PURPLE_MESSAGE_RECV, time_received);
 
 	g_free(username);
 	g_free(msg_purple_markup);