Mercurial > pidgin
changeset 29682:29df7408df03
Eliminate the name collisions on "Title". I have a few qualms:
* I'm only guessing that Novell and Mxit's "Title" corresponds to
the same thing as Jabber's (i.e. the vCard spec)
* I changed MySpace and MSN's tune names to be in line with XMPP's,
but they seem a bit ugly.
* See the XXX in QQ
Closes #1157, hopefully
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 04 Apr 2010 04:31:54 +0000 |
| parents | 97e3a0bc963c |
| children | 1d657e98667b 911f51eb04fd 77b2d015bbf5 |
| files | libpurple/protocols/jabber/buddy.c libpurple/protocols/msn/msn.c libpurple/protocols/mxit/actions.c libpurple/protocols/mxit/profile.c libpurple/protocols/myspace/myspace.c libpurple/protocols/novell/novell.c libpurple/protocols/qq/group_info.c |
| diffstat | 7 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/jabber/buddy.c Sun Apr 04 04:31:54 2010 +0000 @@ -362,7 +362,7 @@ {N_("Email"), "USERID", "EMAIL"}, {N_("Organization Name"), "ORGNAME", "ORG"}, {N_("Organization Unit"), "ORGUNIT", "ORG"}, - {N_("Title"), "TITLE", NULL}, + {N_("Job Title"), "TITLE", NULL}, {N_("Role"), "ROLE", NULL}, {N_("Birthday"), "BDAY", NULL}, {N_("Description"), "DESC", NULL}, @@ -1160,7 +1160,7 @@ g_free(text2); } } else if(text && !strcmp(child->name, "TITLE")) { - purple_notify_user_info_add_pair(user_info, _("Title"), text); + purple_notify_user_info_add_pair(user_info, _("Job Title"), text); } else if(text && !strcmp(child->name, "ROLE")) { purple_notify_user_info_add_pair(user_info, _("Role"), text); } else if(text && !strcmp(child->name, "DESC")) {
--- a/libpurple/protocols/msn/msn.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Apr 04 04:31:54 2010 +0000 @@ -915,9 +915,9 @@ status = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE, "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), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), "game", _("Game Title"), purple_value_new(PURPLE_TYPE_STRING), "office", _("Office Title"), purple_value_new(PURPLE_TYPE_STRING), NULL);
--- a/libpurple/protocols/mxit/actions.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/mxit/actions.c Sun Apr 04 04:31:54 2010 +0000 @@ -335,7 +335,7 @@ purple_request_field_group_add_field( group, field ); /* title */ - field = purple_request_field_string_new( "title", _( "Title" ), profile->title, FALSE ); + field = purple_request_field_string_new( "title", _( "Job Title" ), profile->title, FALSE ); purple_request_field_group_add_field( group, field ); /* first name */
--- a/libpurple/protocols/mxit/profile.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/mxit/profile.c Sun Apr 04 04:31:54 2010 +0000 @@ -128,7 +128,7 @@ purple_notify_user_info_add_section_break( info ); /* optional information */ - purple_notify_user_info_add_pair( info, _( "Title" ), profile->title ); + purple_notify_user_info_add_pair( info, _( "Job Title" ), profile->title ); purple_notify_user_info_add_pair( info, _( "First Name" ), profile->firstname ); purple_notify_user_info_add_pair( info, _( "Last Name" ), profile->lastname ); purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
--- a/libpurple/protocols/myspace/myspace.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/myspace/myspace.c Sun Apr 04 04:31:54 2010 +0000 @@ -503,8 +503,8 @@ TRUE, /* should be user_settable some day */ TRUE, /* independent */ - PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING), - PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), NULL); types = g_list_append(types, status);
--- a/libpurple/protocols/novell/novell.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/novell/novell.c Sun Apr 04 04:31:54 2010 +0000 @@ -1494,7 +1494,7 @@ else if (strcmp(tag, "personalTitle") == 0) return _("Personal Title"); else if (strcmp(tag, "Title") == 0) - return _("Title"); + return _("Job Title"); else if (strcmp(tag, "mailstop") == 0) return _("Mailstop"); else if (strcmp(tag, "Internet EMail Address") == 0)
--- a/libpurple/protocols/qq/group_info.c Sun Apr 04 03:42:16 2010 +0000 +++ b/libpurple/protocols/qq/group_info.c Sun Apr 04 04:31:54 2010 +0000 @@ -138,7 +138,8 @@ room_info = purple_notify_user_info_new(); - purple_notify_user_info_add_pair(room_info, _("Title"), rmd->title_utf8); + /* XXX: Should this be "Topic"? */ + purple_notify_user_info_add_pair(room_info, _("Room Title"), rmd->title_utf8); purple_notify_user_info_add_pair(room_info, _("Notice"), rmd->notice_utf8); purple_notify_user_info_add_pair(room_info, _("Detail"), rmd->desc_utf8);