# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1202313041 0
# Node ID 762174f388071ecee0a5078e801b104117862a6a
# Parent  1f3481447197a5acab423f5f728d4c1f7d280ebc# Parent  7f7c89ff5cc70e28d782e08f250b3169d17e3104
merge of 'c68bf74889268c55c15cf101e1d593966b55c2a9'
     and 'e39a6e9be3df05b59a878001feb9276b9ceb66a9'

diff -r 1f3481447197 -r 762174f38807 libpurple/certificate.h
--- a/libpurple/certificate.h	Wed Feb 06 05:37:32 2008 +0000
+++ b/libpurple/certificate.h	Wed Feb 06 15:50:41 2008 +0000
@@ -31,6 +31,8 @@
 #ifndef _PURPLE_CERTIFICATE_H
 #define _PURPLE_CERTIFICATE_H
 
+#include <time.h>
+
 #include <glib.h>
 
 #ifdef __cplusplus
diff -r 1f3481447197 -r 762174f38807 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Wed Feb 06 05:37:32 2008 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Wed Feb 06 15:50:41 2008 +0000
@@ -168,7 +168,8 @@
 			TRUE,                   /* independent */
 
 			PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING));
+			PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
 
 	types = g_list_append(types, status);