pidgin: 3675047f: Eliminate the name collisions on "Title"...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 3675047f72f66174d95018d40a0100ea0bc87f8c
Ancestor: 95d1be4c6201e2b5cb0ab717d9747b42a5329400
Author: darkrain42 at pidgin.im
Date: 2010-04-04T04:31:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3675047f72f66174d95018d40a0100ea0bc87f8c

Modified 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

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	aba7addd78b84f0da611ca243b6eebbfcdf2850d
+++ libpurple/protocols/jabber/buddy.c	a46c6993b2db1ff61f27f5bf298ac04a472c5e97
@@ -362,7 +362,7 @@ struct vcard_template {
 	{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 @@ static void jabber_vcard_parse(JabberStr
 					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")) {
============================================================
--- libpurple/protocols/msn/msn.c	5a8106a51928918380677fbe201ed78c92bc4735
+++ libpurple/protocols/msn/msn.c	0205dcf3d844d78a817d199f83932331bcd4f41c
@@ -915,9 +915,9 @@ msn_status_types(PurpleAccount *account)
 
 	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);
============================================================
--- libpurple/protocols/mxit/actions.c	6332889a2cf0a76ab7a806f7a779a66873a9d614
+++ libpurple/protocols/mxit/actions.c	adea1cc7bf4b821e7ef4742c9b9d86c3a6f333be
@@ -335,7 +335,7 @@ static void mxit_cb_action_profile( Purp
 	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 */
============================================================
--- libpurple/protocols/mxit/profile.c	7d483ca8919ab3c3cfa252bd761c40ead462f736
+++ libpurple/protocols/mxit/profile.c	64d6448340155312ceb8287105af2a3052ca2d75
@@ -128,7 +128,7 @@ void mxit_show_profile( struct MXitSessi
 	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 );
============================================================
--- libpurple/protocols/myspace/myspace.c	baaf032e236c4494ded4dd7eae5674ad705dd647
+++ libpurple/protocols/myspace/myspace.c	fbe1f2bbbb066cd2b306f1c7786625dba728a6a3
@@ -503,8 +503,8 @@ msim_status_types(PurpleAccount *acct)
 			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);
============================================================
--- libpurple/protocols/novell/novell.c	292cc04d976c1c05a8e61abc1f995e50606a1b67
+++ libpurple/protocols/novell/novell.c	f8e9ca37230059dd36526b2e10fc56c41a3f49c9
@@ -1494,7 +1494,7 @@ _map_property_tag(const char *tag)
 	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)
============================================================
--- libpurple/protocols/qq/group_info.c	182f6e39b964e6b82dc5bfb373f55d12e78a94f6
+++ libpurple/protocols/qq/group_info.c	16e337153a264ae599ea78cd7289b397e672c169
@@ -138,7 +138,8 @@ static void room_info_display(PurpleConn
 
 	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);