Mercurial > pidgin
changeset 22270:762174f38807
merge of 'c68bf74889268c55c15cf101e1d593966b55c2a9'
and 'e39a6e9be3df05b59a878001feb9276b9ceb66a9'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 06 Feb 2008 15:50:41 +0000 |
| parents | 1f3481447197 (current diff) 7f7c89ff5cc7 (diff) |
| children | cc5b2a145652 510ce2239296 f5bcb58bdf56 |
| files | libpurple/protocols/myspace/myspace.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);