changeset
merge of 'b4f54ad21ffaa37ecd317e7700e4cd6c2631cd2b'
Wed, 06 Feb 2008 15:52:08 +0000
- author
- Luke Schierer <lschiere@pidgin.im>
- date
- Wed, 06 Feb 2008 15:52:08 +0000
- changeset 22397
- ce4724bf245c
- parent 22393
- b4f54ad21ffa (current diff)
- parent 22396
- e0813f691fe2 (diff)
- child 22398
- 1a6f172dfbd4
- child 22401
- 5fe1761a4a15
- child 22402
- f784fd919fba
merge of 'b4f54ad21ffaa37ecd317e7700e4cd6c2631cd2b'
and 'e0813f691fe2c9b4917266e971d978dbefadd9cd'
| libpurple/protocols/myspace/myspace.c | file | annotate | diff | comparison | revisions |
--- a/libpurple/certificate.h Wed Feb 06 05:37:32 2008 +0000 +++ b/libpurple/certificate.h Wed Feb 06 15:52:08 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:52:08 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);
