# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1314069726 0
# Node ID c87cfdba16c857abaaffb6641c5969d096f35bd6
# Parent  e304b1a0b5161dd2dc66b0c9dc25ebf888e13f60# Parent  d9c7126086ec3d3c79f8958d89f58c37d7d8f084
merge of '06fd8a15a3af927e3ce13b04af6e2159fb537dd9'
     and 'cd7e0618fa45ee113bac1516e7f907b02c79219a'

diff -r e304b1a0b516 -r c87cfdba16c8 libpurple/protocols/mxit/mxit.c
--- a/libpurple/protocols/mxit/mxit.c	Mon Aug 22 22:56:24 2011 +0000
+++ b/libpurple/protocols/mxit/mxit.c	Tue Aug 23 03:22:06 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 e304b1a0b516 -r c87cfdba16c8 libpurple/protocols/mxit/profile.c
--- a/libpurple/protocols/mxit/profile.c	Mon Aug 22 22:56:24 2011 +0000
+++ b/libpurple/protocols/mxit/profile.c	Tue Aug 23 03:22:06 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 */