Mercurial > pidgin
changeset 24465:9eafd4a52906
merge of '59b09f0d1f3f4226f7edfd8351478498fbd6b8d3'
and 'ca4b6e987b967927b0f8bd001bc33440a6885000'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 17 Nov 2008 07:44:40 +0000 |
| parents | 3a3d36791a47 (diff) ef9da5db3c71 (current diff) |
| children | de3b12b70b5f 10e1f3c1d0db |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sun Nov 16 22:51:18 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Nov 17 07:44:40 2008 +0000 @@ -1729,7 +1729,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),
--- a/libpurple/protocols/msn/msn.c Sun Nov 16 22:51:18 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Mon Nov 17 07:44:40 2008 +0000 @@ -836,7 +836,7 @@ types = g_list_append(types, status); status = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE, - "tune", NULL, TRUE, TRUE, TRUE, + "tune", NULL, FALSE, TRUE, TRUE, PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING), PURPLE_TUNE_ALBUM, _("Album"), purple_value_new(PURPLE_TYPE_STRING), PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING),
--- a/libpurple/protocols/myspace/myspace.c Sun Nov 16 22:51:18 2008 +0000 +++ b/libpurple/protocols/myspace/myspace.c Mon Nov 17 07:44:40 2008 +0000 @@ -139,7 +139,7 @@ prim, /* PurpleStatusPrimitive */ \ NULL, /* id - use default */ \ NULL, /* name - use default */ \ - TRUE, /* savable */ \ + TRUE, /* saveable */ \ TRUE, /* user_settable */ \ FALSE, /* not independent */ \ \ @@ -163,7 +163,7 @@ PURPLE_STATUS_TUNE, /* primitive */ "tune", /* ID */ NULL, /* name - use default */ - TRUE, /* savable */ + FALSE, /* saveable */ TRUE, /* should be user_settable some day */ TRUE, /* independent */