Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 25331:10e1f3c1d0db
explicit merge of '8c6ea3b255d94e0f2867fea830b1380415e6d47a'
and '5459c606fe645dac4dddd188eca62eb52a9f7745'
to branch 'im.pidgin.pidgin.next.minor'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 27 Nov 2008 06:05:42 +0000 |
| parents | aa876d48b5b2 3a3d36791a47 |
| children | aa1fe87558d8 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Wed Nov 26 00:40:27 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Nov 27 06:05:42 2008 +0000 @@ -1737,7 +1737,7 @@ types = g_list_append(types, type); type = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE, - "tune", NULL, TRUE, TRUE, TRUE, + "tune", NULL, FALSE, TRUE, TRUE, PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),