# HG changeset patch # User andrew.victor@mxit.com # Date 1314050995 0 # Node ID d9c7126086ec3d3c79f8958d89f58c37d7d8f084 # Parent 57694928058e9a4d701ba7204d7f859c7d8159b4 These should be using purple_notify_user_info_add_pair_plaintext(). diff -r 57694928058e -r d9c7126086ec libpurple/protocols/mxit/mxit.c --- a/libpurple/protocols/mxit/mxit.c Mon Aug 22 16:36:48 2011 +0000 +++ b/libpurple/protocols/mxit/mxit.c Mon Aug 22 22:09:55 2011 +0000 @@ -358,11 +358,8 @@ purple_notify_user_info_add_pair_plaintext( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) ); /* rejection message */ - if ( ( contact->subtype == MXIT_SUBTYPE_REJECTED ) && ( contact->msg != NULL ) ) { - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Rejection Message" ), contact->msg ); - } + if ( ( contact->subtype == MXIT_SUBTYPE_REJECTED ) && ( contact->msg != NULL ) ) + purple_notify_user_info_add_pair_plaintext( info, _( "Rejection Message" ), contact->msg ); } diff -r 57694928058e -r d9c7126086ec libpurple/protocols/mxit/profile.c --- a/libpurple/protocols/mxit/profile.c Mon Aug 22 16:36:48 2011 +0000 +++ b/libpurple/protocols/mxit/profile.c Mon Aug 22 22:09:55 2011 +0000 @@ -175,39 +175,25 @@ contact = purple_buddy_get_protocol_data( buddy ); } - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Display Name" ), profile->nickname ); + purple_notify_user_info_add_pair_plaintext( info, _( "Display Name" ), profile->nickname ); tmp = g_strdup_printf("%s (%i)", profile->birthday, calculateAge( profile->birthday ) ); - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Birthday" ), tmp ); + purple_notify_user_info_add_pair_plaintext( info, _( "Birthday" ), tmp ); g_free( tmp ); purple_notify_user_info_add_pair_plaintext( info, _( "Gender" ), profile->male ? _( "Male" ) : _( "Female" ) ); /* optional information */ - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "First Name" ), profile->firstname ); - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Last Name" ), profile->lastname ); - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Country" ), profile->regcountry ); + purple_notify_user_info_add_pair_plaintext( info, _( "First Name" ), profile->firstname ); + purple_notify_user_info_add_pair_plaintext( info, _( "Last Name" ), profile->lastname ); + + purple_notify_user_info_add_pair_plaintext( info, _( "Country" ), profile->regcountry ); - if ( *profile->aboutme ) { - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "About Me" ), profile->aboutme ); - } - if ( *profile->whereami ) { - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Where I Live" ), profile->whereami ); - } + if ( *profile->aboutme ) + purple_notify_user_info_add_pair_plaintext( info, _( "About Me" ), profile->aboutme ); + + if ( *profile->whereami ) + purple_notify_user_info_add_pair_plaintext( info, _( "Where I Live" ), profile->whereami ); purple_notify_user_info_add_section_break( info ); @@ -241,11 +227,8 @@ if ( contact ) { /* invite found */ - if ( contact->msg ) { - /* TODO: Check whether it's correct to call add_pair_html, - or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair_html( info, _( "Invite Message" ), contact->msg ); - } + if ( contact->msg ) + purple_notify_user_info_add_pair_plaintext( info, _( "Invite Message" ), contact->msg ); if ( contact->imgid ) { /* this invite has a avatar */