Mercurial > pidgin

changeset 31907:99ca503ea087

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename purple_notify_user_info_add_pair to purple_notify_user_info_add_pair_html, to be more explicit so hopefully people don't pass this non-html in the future.
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 02:23:28 +0000
parents e8d4755ef84b
children a686269689fe
files libpurple/notify.c libpurple/notify.h libpurple/protocols/bonjour/bonjour.c libpurple/protocols/gg/gg.c libpurple/protocols/irc/msgs.c libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/jabber.c libpurple/protocols/msn/msn.c libpurple/protocols/mxit/mxit.c libpurple/protocols/mxit/profile.c libpurple/protocols/myspace/user.c libpurple/protocols/novell/novell.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/userinfo.c libpurple/protocols/sametime/sametime.c libpurple/protocols/silc/buddy.c libpurple/protocols/silc/ops.c libpurple/protocols/yahoo/yahoo_profile.c libpurple/protocols/zephyr/zephyr.c libpurple/util.c pidgin/gtkblist.c
diffstat 21 files changed, 98 insertions(+), 105 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/notify.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/notify.c	Mon Aug 22 02:23:28 2011 +0000
@@ -575,7 +575,7 @@
 }
 
 void
-purple_notify_user_info_add_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
+purple_notify_user_info_add_pair_html(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
 {
 	PurpleNotifyUserInfoEntry *entry;
 
@@ -587,12 +587,10 @@
 purple_notify_user_info_add_pair_plaintext(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
 {
 	gchar *escaped;
-	PurpleNotifyUserInfoEntry *entry;
 
 	escaped = g_markup_escape_text(value, -1);
-	entry = purple_notify_user_info_entry_new(label, escaped);
+	purple_notify_user_info_add_pair_html(user_info, label, escaped);
 	g_free(escaped);
-	user_info->user_info_entries = g_list_append(user_info->user_info_entries, entry);
 }
 
 void
--- a/libpurple/notify.h	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/notify.h	Mon Aug 22 02:23:28 2011 +0000
@@ -480,16 +480,10 @@
  *                   the UI should treat label as independent and not
  *                   include a colon if it would otherwise.
  */
-/*
- * TODO: In 3.0.0 this function should be renamed to
- *       purple_notify_user_info_add_pair_html().  And optionally
- *       purple_notify_user_info_add_pair_plaintext() could be renamed to
- *       purple_notify_user_info_add_pair().
- */
-void purple_notify_user_info_add_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value);
+void purple_notify_user_info_add_pair_html(PurpleNotifyUserInfo *user_info, const char *label, const char *value);
 
 /**
- * Like purple_notify_user_info_add_pair, but value should be plaintext
+ * Like purple_notify_user_info_add_pair_html, but value should be plaintext
  * and will be escaped using g_markup_escape_text().
  */
 void purple_notify_user_info_add_pair_plaintext(PurpleNotifyUserInfo *user_info, const char *label, const char *value);
@@ -530,7 +524,8 @@
  *
  * If added to a PurpleNotifyUserInfo object, this should not be free()'d,
  * as PurpleNotifyUserInfo will do so when destroyed.
- * purple_notify_user_info_add_pair() and
+ * purple_notify_user_info_add_pair_html(),
+ * purple_notify_user_info_add_pair_plaintext() and
  * purple_notify_user_info_prepend_pair() are convenience methods for
  * creating entries and adding them to a PurpleNotifyUserInfo.
  *
--- a/libpurple/protocols/bonjour/bonjour.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Mon Aug 22 02:23:28 2011 +0000
@@ -375,7 +375,7 @@
 	if (message != 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(user_info, _("Message"), message);
+		purple_notify_user_info_add_pair_html(user_info, _("Message"), message);
 	}
 
 	if (bb == NULL) {
@@ -388,31 +388,31 @@
 		if (bb->first != NULL && *bb->first != '\0') {
 			/* 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(user_info, _("First name"), bb->first);
+			purple_notify_user_info_add_pair_html(user_info, _("First name"), bb->first);
 		}
 		if (bb->last != NULL && *bb->last != '\0') {
 			/* 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(user_info, _("Last name"), bb->last);
+			purple_notify_user_info_add_pair_html(user_info, _("Last name"), bb->last);
 		}
 	}
 
 	if (bb->email != NULL && *bb->email != '\0') {
 		/* 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(user_info, _("Email"), bb->email);
+		purple_notify_user_info_add_pair_html(user_info, _("Email"), bb->email);
 	}
 
 	if (bb->AIM != NULL && *bb->AIM != '\0') {
 		/* 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(user_info, _("AIM Account"), bb->AIM);
+		purple_notify_user_info_add_pair_html(user_info, _("AIM Account"), bb->AIM);
 	}
 
 	if (bb->jid != NULL && *bb->jid != '\0') {
 		/* 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(user_info, _("XMPP Account"), bb->jid);
+		purple_notify_user_info_add_pair_html(user_info, _("XMPP Account"), bb->jid);
 	}
 }
 
--- a/libpurple/protocols/gg/gg.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/gg/gg.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1200,31 +1200,31 @@
 	who = ggp_search_get_result(req, 0, GG_PUBDIR50_UIN);
 	/* 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(user_info, _("UIN"), who);
+	purple_notify_user_info_add_pair_html(user_info, _("UIN"), who);
 
 	val = ggp_search_get_result(req, 0, GG_PUBDIR50_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(user_info, _("First Name"), val);
+	purple_notify_user_info_add_pair_html(user_info, _("First Name"), val);
 	g_free(val);
 
 	val = ggp_search_get_result(req, 0, GG_PUBDIR50_NICKNAME);
 	/* 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(user_info, _("Nickname"), val);
+	purple_notify_user_info_add_pair_html(user_info, _("Nickname"), val);
 	g_free(val);
 
 	val = ggp_search_get_result(req, 0, GG_PUBDIR50_CITY);
 	/* 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(user_info, _("City"), val);
+	purple_notify_user_info_add_pair_html(user_info, _("City"), val);
 	g_free(val);
 
 	val = ggp_search_get_result(req, 0, GG_PUBDIR50_BIRTHYEAR);
 	if (strncmp(val, "0", 1)) {
 		/* 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(user_info, _("Birth Year"), val);
+		purple_notify_user_info_add_pair_html(user_info, _("Birth Year"), val);
 	}
 	g_free(val);
 
--- a/libpurple/protocols/irc/msgs.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/irc/msgs.c	Mon Aug 22 02:23:28 2011 +0000
@@ -352,7 +352,7 @@
 	tmp = g_strdup_printf("%s%s%s", tmp2,
 				(irc->whois.ircop ? _(" <i>(ircop)</i>") : ""),
 				(irc->whois.identified ? _(" <i>(identified)</i>") : ""));
-	purple_notify_user_info_add_pair(user_info, _("Nick"), tmp);
+	purple_notify_user_info_add_pair_html(user_info, _("Nick"), tmp);
 	g_free(tmp2);
 	g_free(tmp);
 
--- a/libpurple/protocols/jabber/buddy.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1136,7 +1136,7 @@
 						char *mailto;
 						escaped = g_markup_escape_text(userid, -1);
 						mailto = g_strdup_printf("<a href=\"mailto:%s\">%s</a>", escaped, escaped);
-						purple_notify_user_info_add_pair(user_info, _("Email"), mailto);
+						purple_notify_user_info_add_pair_html(user_info, _("Email"), mailto);
 
 						g_free(mailto);
 						g_free(escaped);
@@ -1149,7 +1149,7 @@
 
 					escaped = g_markup_escape_text(userid, -1);
 					mailto = g_strdup_printf("<a href=\"mailto:%s\">%s</a>", escaped, escaped);
-					purple_notify_user_info_add_pair(user_info, _("Email"), mailto);
+					purple_notify_user_info_add_pair_html(user_info, _("Email"), mailto);
 
 					g_free(mailto);
 					g_free(escaped);
@@ -1196,7 +1196,7 @@
 						jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(purple_imgstore_add_with_id(g_memdup(data, size), size, "logo.png")));
 						img_text = g_strdup_printf("<img id='%d'>", GPOINTER_TO_INT(jbi->vcard_imgids->data));
 
-						purple_notify_user_info_add_pair(user_info, (photo ? _("Photo") : _("Logo")), img_text);
+						purple_notify_user_info_add_pair_html(user_info, (photo ? _("Photo") : _("Logo")), img_text);
 
 						hash = jabber_calculate_data_hash(data, size, "sha1");
 						purple_buddy_icons_set_for_user(account, bare_jid, data, size, hash);
--- a/libpurple/protocols/jabber/jabber.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Aug 22 02:23:28 2011 +0000
@@ -2225,7 +2225,7 @@
 	label = g_strdup_printf("%s%s", _("Status"), (res ? res : ""));
 	value = g_strdup_printf("%s%s%s", state, (text ? ": " : ""), (text ? text : ""));
 
-	purple_notify_user_info_add_pair(user_info, label, value);
+	purple_notify_user_info_add_pair_html(user_info, label, value);
 	g_free(label);
 	g_free(value);
 	g_free(text);
@@ -2310,10 +2310,10 @@
 					char *moodplustext =
 						g_strdup_printf("%s (%s)", description ? _(description) : mood, moodtext);
 
-					purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext);
+					purple_notify_user_info_add_pair_html(user_info, _("Mood"), moodplustext);
 					g_free(moodplustext);
 				} else
-					purple_notify_user_info_add_pair(user_info, _("Mood"),
+					purple_notify_user_info_add_pair_html(user_info, _("Mood"),
 					    description ? _(description) : mood);
 			}
 			if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
@@ -2323,7 +2323,7 @@
 				const char *album = purple_status_get_attr_string(tune, PURPLE_TUNE_ALBUM);
 				char *playing = purple_util_format_song_info(title, artist, album, NULL);
 				if (playing) {
-					purple_notify_user_info_add_pair(user_info, _("Now Listening"), playing);
+					purple_notify_user_info_add_pair_html(user_info, _("Now Listening"), playing);
 					g_free(playing);
 				}
 			}
@@ -2344,12 +2344,12 @@
 					sub = _("None");
 			}
 
-			purple_notify_user_info_add_pair(user_info, _("Subscription"), sub);
+			purple_notify_user_info_add_pair_html(user_info, _("Subscription"), sub);
 
 		}
 
 		if(!PURPLE_BUDDY_IS_ONLINE(b) && jb->error_msg) {
-			purple_notify_user_info_add_pair(user_info, _("Error"), jb->error_msg);
+			purple_notify_user_info_add_pair_html(user_info, _("Error"), jb->error_msg);
 		}
 	}
 }
--- a/libpurple/protocols/msn/msn.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1078,7 +1078,7 @@
 			if (psm != NULL && *psm) {
 				purple_notify_user_info_add_pair_plaintext(user_info, tmp2, psm);
 			} else {
-				purple_notify_user_info_add_pair(user_info, _("Status"), tmp2);
+				purple_notify_user_info_add_pair_html(user_info, _("Status"), tmp2);
 			}
 
 			g_free(tmp2);
@@ -1103,7 +1103,7 @@
 		if (currentmedia) {
 			/* 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(user_info, mediatype, currentmedia);
+			purple_notify_user_info_add_pair_html(user_info, mediatype, currentmedia);
 			g_free(currentmedia);
 		}
 	}
@@ -1131,21 +1131,21 @@
 		if (phone != 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(user_info, _("Home Phone Number"), phone);
+			purple_notify_user_info_add_pair_html(user_info, _("Home Phone Number"), phone);
 		}
 
 		phone = msn_user_get_work_phone(user);
 		if (phone != 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(user_info, _("Work Phone Number"), phone);
+			purple_notify_user_info_add_pair_html(user_info, _("Work Phone Number"), phone);
 		}
 
 		phone = msn_user_get_mobile_phone(user);
 		if (phone != 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(user_info, _("Mobile Phone Number"), phone);
+			purple_notify_user_info_add_pair_html(user_info, _("Mobile Phone Number"), phone);
 		}
 	}
 }
@@ -2273,7 +2273,7 @@
 		{
 			char *nicktext = g_markup_escape_text(alias, -1);
 			tmp = g_strdup_printf("<font sml=\"msn\">%s</font>", nicktext);
-			purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp);
+			purple_notify_user_info_add_pair_html(user_info, _("Nickname"), tmp);
 			g_free(tmp);
 			g_free(nicktext);
 		}
@@ -2372,7 +2372,7 @@
 
 	if (error_message != NULL || url_text == NULL || strcmp(url_text, "") == 0)
 	{
-		purple_notify_user_info_add_pair(user_info,
+		purple_notify_user_info_add_pair_html(user_info,
 				_("Error retrieving profile"), NULL);
 
 		purple_notify_userinfo(info_data->gc, info_data->name, user_info, NULL, NULL);
@@ -2691,7 +2691,7 @@
 	if (user_url != NULL)
 	{
 		tmp = g_strdup_printf("<a href=\"%s\">%s</a>", user_url, user_url);
-		purple_notify_user_info_add_pair(user_info, _("Homepage"), tmp);
+		purple_notify_user_info_add_pair_html(user_info, _("Homepage"), tmp);
 		g_free(tmp);
 		g_free(user_url);
 
@@ -2714,7 +2714,7 @@
 		char *p = strstr(url_buffer, "<form id=\"profile_form\" name=\"profile_form\" action=\"http&#58;&#47;&#47;spaces.live.com&#47;profile.aspx&#63;cid&#61;0\"");
 		PurpleBuddy *b = purple_find_buddy
 				(purple_connection_get_account(info_data->gc), info_data->name);
-		purple_notify_user_info_add_pair(user_info,
+		purple_notify_user_info_add_pair_html(user_info,
 				_("Error retrieving profile"), NULL);
 		purple_notify_user_info_add_pair_plaintext(user_info, NULL,
 				((p && b) ? _("The user has not created a public profile.") :
@@ -2731,7 +2731,7 @@
 	purple_notify_user_info_add_section_break(user_info);
 	tmp = g_strdup_printf("<a href=\"%s%s\">%s</a>",
 			PROFILE_URL, info_data->name, _("View web profile"));
-	purple_notify_user_info_add_pair(user_info, NULL, tmp);
+	purple_notify_user_info_add_pair_html(user_info, NULL, tmp);
 	g_free(tmp);
 
 #if PHOTO_SUPPORT
--- a/libpurple/protocols/mxit/mxit.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/mxit/mxit.c	Mon Aug 22 02:23:28 2011 +0000
@@ -346,7 +346,7 @@
 	if ( contact->statusMsg ) {
 		/* 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( info, _( "Status Message" ), contact->statusMsg );
+		purple_notify_user_info_add_pair_html( info, _( "Status Message" ), contact->statusMsg );
 	}
 
 	/* mood */
@@ -361,7 +361,7 @@
 	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( info, _( "Rejection Message" ), contact->msg );
+		purple_notify_user_info_add_pair_html( info, _( "Rejection Message" ), contact->msg );
 	}
 }
 
--- a/libpurple/protocols/mxit/profile.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/mxit/profile.c	Mon Aug 22 02:23:28 2011 +0000
@@ -177,12 +177,12 @@
 
 	/* 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( info, _( "Display Name" ), profile->nickname );
+	purple_notify_user_info_add_pair_html( 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( info, _( "Birthday" ), tmp );
+	purple_notify_user_info_add_pair_html( info, _( "Birthday" ), tmp );
 	g_free( tmp );
 
 	purple_notify_user_info_add_pair_plaintext( info, _( "Gender" ), profile->male ? _( "Male" ) : _( "Female" ) );
@@ -190,23 +190,23 @@
 	/* 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( info, _( "First Name" ), profile->firstname );
+	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( info, _( "Last Name" ), profile->lastname );
+	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( info, _( "Country" ), profile->regcountry );
+	purple_notify_user_info_add_pair_html( 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( info, _( "About Me" ), profile->aboutme );
+		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( info, _( "Where I Live" ), profile->whereami );
+		purple_notify_user_info_add_pair_html( info, _( "Where I Live" ), profile->whereami );
 	}
 
 	purple_notify_user_info_add_section_break( info );
@@ -229,7 +229,7 @@
 		if ( contact->statusMsg ) {
 			/* 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( info, _( "Status Message" ), contact->statusMsg );
+			purple_notify_user_info_add_pair_html( info, _( "Status Message" ), contact->statusMsg );
 		}
 
 		/* subscription type */
@@ -244,21 +244,21 @@
 			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( info, _( "Invite Message" ), contact->msg );
+				purple_notify_user_info_add_pair_html( info, _( "Invite Message" ), contact->msg );
 			}
 
 			if ( contact->imgid ) {
 				/* this invite has a avatar */
 				char* img_text;
 				img_text = g_strdup_printf( "<img id='%d'>", contact->imgid );
-				purple_notify_user_info_add_pair( info, _( "Photo" ), img_text );
+				purple_notify_user_info_add_pair_html( info, _( "Photo" ), img_text );
 				g_free(img_text);
 			}
 
 			if ( contact->statusMsg ) {
 				/* 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( info, _( "Status Message" ), contact->statusMsg );
+				purple_notify_user_info_add_pair_html( info, _( "Status Message" ), contact->statusMsg );
 			}
 		}
 	}
--- a/libpurple/protocols/myspace/user.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/myspace/user.c	Mon Aug 22 02:23:28 2011 +0000
@@ -206,7 +206,7 @@
 		else
 			profile = g_strdup_printf("<a href=\"http://myspace.com/%d\">%s</a>",
 					user->id, _("View web profile"));
-		purple_notify_user_info_add_pair(user_info, NULL, profile);
+		purple_notify_user_info_add_pair_html(user_info, NULL, profile);
 		g_free(profile);
 	}
 }
--- a/libpurple/protocols/novell/novell.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/novell/novell.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1517,7 +1517,7 @@
 	if (value) {
 		/* 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(user_info, tag, value);
+		purple_notify_user_info_add_pair_html(user_info, tag, value);
 	}
 
 #if 0
@@ -1526,7 +1526,7 @@
 	if (value) {
 		/* 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(user_info, tag, value);
+		purple_notify_user_info_add_pair_html(user_info, tag, value);
 	}
 #endif /* if 0 */
 
@@ -1535,7 +1535,7 @@
 	if (value) {
 		/* 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(user_info, tag, value);
+		purple_notify_user_info_add_pair_html(user_info, tag, value);
 	}
 
 	count = nm_user_record_get_property_count(user_record);
@@ -1547,7 +1547,7 @@
 			if (tag && value) {
 				/* 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(user_info, tag, value);
+				purple_notify_user_info_add_pair_html(user_info, tag, value);
 			}
 			nm_release_property(property);
 		}
@@ -2874,7 +2874,7 @@
 			if (text) {
 				/* 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(user_info, _("Message"), text);
+				purple_notify_user_info_add_pair_html(user_info, _("Message"), text);
 			}
 		}
 	}
--- a/libpurple/protocols/oscar/oscar.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Aug 22 02:23:28 2011 +0000
@@ -2297,9 +2297,9 @@
 			purple_notify_user_info_add_pair_plaintext(user_info, _("UIN"), who);
 			/* 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(user_info, _("Status"), statusmsg);
+			purple_notify_user_info_add_pair_html(user_info, _("Status"), statusmsg);
 			purple_notify_user_info_add_section_break(user_info);
-			purple_notify_user_info_add_pair(user_info, NULL, g_strjoinv("<BR>", splitmsg));
+			purple_notify_user_info_add_pair_html(user_info, NULL, g_strjoinv("<BR>", splitmsg));
 
 			g_free(statusmsg);
 			g_strfreev(splitmsg);
@@ -2324,9 +2324,9 @@
 			purple_notify_user_info_add_pair_plaintext(user_info, _("UIN"), who);
 			/* 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(user_info, _("Status"), statusmsg);
+			purple_notify_user_info_add_pair_html(user_info, _("Status"), statusmsg);
 			purple_notify_user_info_add_section_break(user_info);
-			purple_notify_user_info_add_pair(user_info, NULL, g_strjoinv("<BR>", splitmsg));
+			purple_notify_user_info_add_pair_html(user_info, NULL, g_strjoinv("<BR>", splitmsg));
 
 			g_free(statusmsg);
 			g_strfreev(splitmsg);
--- a/libpurple/protocols/oscar/userinfo.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/oscar/userinfo.c	Mon Aug 22 02:23:28 2011 +0000
@@ -140,7 +140,7 @@
 		/* TODO: Check whether it's correct to call add_pair_html,
 		         or if we should be using add_pair_plaintext.  Will
 		         need to check callers of this function. */
-		purple_notify_user_info_add_pair(user_info, name, utf8);
+		purple_notify_user_info_add_pair_html(user_info, name, utf8);
 		g_free(utf8);
 	}
 }
@@ -156,7 +156,7 @@
 		/* TODO: Check whether it's correct to call add_pair_html,
 		         or if we should be using add_pair_plaintext.  Will
 		         need to check callers of this function. */
-		purple_notify_user_info_add_pair(user_info, name, tmp);
+		purple_notify_user_info_add_pair_html(user_info, name, tmp);
 		g_free(utf8);
 		g_free(tmp);
 	}
@@ -293,12 +293,12 @@
 			} else {
 				description = g_strdup(_(mood));
 			}
-			purple_notify_user_info_add_pair(user_info, _("Mood"), description);
+			purple_notify_user_info_add_pair_html(user_info, _("Mood"), description);
 			g_free(description);
 		}
 	}
 
-	purple_notify_user_info_add_pair(user_info, _("Status"), message);
+	purple_notify_user_info_add_pair_html(user_info, _("Status"), message);
 	g_free(message);
 }
 
@@ -537,7 +537,7 @@
 		if (tmp && *tmp) {
 			/* 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(user_info, _("Profile"), tmp);
+			purple_notify_user_info_add_pair_html(user_info, _("Profile"), tmp);
 		}
 		g_free(tmp);
 		g_free(info_utf8);
@@ -547,7 +547,7 @@
 	base_profile_url = oscar_util_valid_name_icq(userinfo->bn) ? "http://www.icq.com/people" : "http://profiles.aim.com";
 	tmp = g_strdup_printf("<a href=\"%s/%s\">%s</a>",
 			base_profile_url, purple_normalize(account, userinfo->bn), _("View web profile"));
-	purple_notify_user_info_add_pair(user_info, NULL, tmp);
+	purple_notify_user_info_add_pair_html(user_info, NULL, tmp);
 	g_free(tmp);
 
 	purple_notify_userinfo(gc, userinfo->bn, user_info, NULL, NULL);
--- a/libpurple/protocols/sametime/sametime.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Mon Aug 22 02:23:28 2011 +0000
@@ -4198,7 +4198,7 @@
   user_info = purple_notify_user_info_new();
 
   if(purple_str_has_prefix(who, "@E ")) {
-	purple_notify_user_info_add_pair(user_info, _("External User"), NULL);
+	purple_notify_user_info_add_pair_html(user_info, _("External User"), NULL);
   }
 
   purple_notify_user_info_add_pair_plaintext(user_info, _("User ID"), who);
@@ -4209,7 +4209,7 @@
     if(purple_buddy_get_server_alias(b)) {
 		/* 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(user_info, _("Full Name"), purple_buddy_get_server_alias(b));
+		purple_notify_user_info_add_pair_html(user_info, _("Full Name"), purple_buddy_get_server_alias(b));
     }
 
     type = purple_blist_node_get_int((PurpleBlistNode *) b, BUDDY_KEY_CLIENT);
@@ -4219,7 +4219,7 @@
 		purple_notify_user_info_add_pair_plaintext(user_info, _("Last Known Client"), tmp2);
 	  } else {
 		tmp = g_strdup_printf(_("Unknown (0x%04x)<br>"), type);
-		purple_notify_user_info_add_pair(user_info, _("Last Known Client"), tmp);
+		purple_notify_user_info_add_pair_html(user_info, _("Last Known Client"), tmp);
 	    g_free(tmp);
 	  }
     }
--- a/libpurple/protocols/silc/buddy.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/silc/buddy.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1549,13 +1549,13 @@
 	if (client_entry->nickname)
 		/* 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(user_info, _("Nickname"),
+		purple_notify_user_info_add_pair_html(user_info, _("Nickname"),
 					       client_entry->nickname);
 	if (client_entry->username && client_entry->hostname) {
 		g_snprintf(tmp, sizeof(tmp), "%s@%s", client_entry->username, client_entry->hostname);
 		/* 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(user_info, _("Username"), tmp);
+		purple_notify_user_info_add_pair_html(user_info, _("Username"), tmp);
 	}
 	if (client_entry->mode) {
 		memset(tmp, 0, sizeof(tmp));
@@ -1569,7 +1569,7 @@
 	if (statusstr) {
 		/* 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(user_info, _("Message"), statusstr);
+		purple_notify_user_info_add_pair_html(user_info, _("Message"), statusstr);
 		g_free(statusstr);
 	}
 
@@ -1577,42 +1577,42 @@
 		if (moodstr) {
 			/* 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(user_info, _("Mood"), moodstr);
+			purple_notify_user_info_add_pair_html(user_info, _("Mood"), moodstr);
 			g_free(moodstr);
 		}
 
 		if (contactstr) {
 			/* 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(user_info, _("Preferred Contact"), contactstr);
+			purple_notify_user_info_add_pair_html(user_info, _("Preferred Contact"), contactstr);
 			g_free(contactstr);
 		}
 
 		if (langstr) {
 			/* 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(user_info, _("Preferred Language"), langstr);
+			purple_notify_user_info_add_pair_html(user_info, _("Preferred Language"), langstr);
 			g_free(langstr);
 		}
 
 		if (devicestr) {
 			/* 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(user_info, _("Device"), devicestr);
+			purple_notify_user_info_add_pair_html(user_info, _("Device"), devicestr);
 			g_free(devicestr);
 		}
 
 		if (tzstr) {
 			/* 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(user_info, _("Timezone"), tzstr);
+			purple_notify_user_info_add_pair_html(user_info, _("Timezone"), tzstr);
 			g_free(tzstr);
 		}
 
 		if (geostr) {
 			/* 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(user_info, _("Geolocation"), geostr);
+			purple_notify_user_info_add_pair_html(user_info, _("Geolocation"), geostr);
 			g_free(geostr);
 		}
 	}
--- a/libpurple/protocols/silc/ops.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/silc/ops.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1202,14 +1202,14 @@
 							    tmp, sizeof(tmp) - strlen(tmp));
 				/* 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(user_info, _("User Modes"), tmp);
+				purple_notify_user_info_add_pair_html(user_info, _("User Modes"), tmp);
 			}
 
 			silcpurple_parse_attrs(client_entry->attrs, &moodstr, &statusstr, &contactstr, &langstr, &devicestr, &tzstr, &geostr);
 			if (moodstr) {
 				/* 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(user_info, _("Mood"), moodstr);
+				purple_notify_user_info_add_pair_html(user_info, _("Mood"), moodstr);
 				g_free(moodstr);
 			}
 
@@ -1221,42 +1221,42 @@
 			if (contactstr) {
 				/* 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(user_info, _("Preferred Contact"), contactstr);
+				purple_notify_user_info_add_pair_html(user_info, _("Preferred Contact"), contactstr);
 				g_free(contactstr);
 			}
 
 			if (langstr) {
 				/* 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(user_info, _("Preferred Language"), langstr);
+				purple_notify_user_info_add_pair_html(user_info, _("Preferred Language"), langstr);
 				g_free(langstr);
 			}
 
 			if (devicestr) {
 				/* 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(user_info, _("Device"), devicestr);
+				purple_notify_user_info_add_pair_html(user_info, _("Device"), devicestr);
 				g_free(devicestr);
 			}
 
 			if (tzstr) {
 				/* 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(user_info, _("Timezone"), tzstr);
+				purple_notify_user_info_add_pair_html(user_info, _("Timezone"), tzstr);
 				g_free(tzstr);
 			}
 
 			if (geostr) {
 				/* 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(user_info, _("Geolocation"), geostr);
+				purple_notify_user_info_add_pair_html(user_info, _("Geolocation"), geostr);
 				g_free(geostr);
 			}
 
 			if (*client_entry->server) {
 				/* 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(user_info, _("Server"), client_entry->server);
+				purple_notify_user_info_add_pair_html(user_info, _("Server"), client_entry->server);
 			}
 
 			if (channels && user_modes) {
@@ -1344,7 +1344,7 @@
 			if (client_entry && *client_entry->server) {
 				/* 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(user_info, _("Server"), client_entry->server);
+				purple_notify_user_info_add_pair_html(user_info, _("Server"), client_entry->server);
 			}
 
 
--- a/libpurple/protocols/yahoo/yahoo_profile.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/yahoo/yahoo_profile.c	Mon Aug 22 02:23:28 2011 +0000
@@ -805,7 +805,7 @@
 	 * to send back HTML, with a 200 status code.
 	 */
 	if (error_message != NULL || url_text == NULL || strcmp(url_text, "") == 0) {
-		purple_notify_user_info_add_pair(user_info, _("Error retrieving profile"), NULL);
+		purple_notify_user_info_add_pair_html(user_info, _("Error retrieving profile"), NULL);
 		purple_notify_userinfo(info_data->gc, info_data->name,
 			user_info, NULL, NULL);
 		purple_notify_user_info_destroy(user_info);
@@ -840,7 +840,7 @@
 						 _("If you wish to view this profile, "
 						"you will need to visit this link in your web browser:"),
 						 profile_url_text, profile_url_text);
-		purple_notify_user_info_add_pair(user_info, NULL, tmp);
+		purple_notify_user_info_add_pair_html(user_info, NULL, tmp);
 		g_free(tmp);
 
 		purple_notify_userinfo(info_data->gc, info_data->name,
@@ -1048,7 +1048,7 @@
 			id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL);
 
 			tmp = g_strdup_printf("<img id=\"%d\"><br>", id);
-			purple_notify_user_info_add_pair(user_info, NULL, tmp);
+			purple_notify_user_info_add_pair_html(user_info, NULL, tmp);
 			g_free(tmp);
 		}
 	}
@@ -1195,7 +1195,7 @@
 		const gchar *str;
 
 		purple_notify_user_info_add_section_break(user_info);
-		purple_notify_user_info_add_pair(user_info,
+		purple_notify_user_info_add_pair_html(user_info,
 				_("Error retrieving profile"), NULL);
 
 		if (profile_state == PROFILE_STATE_UNKNOWN_LANGUAGE) {
@@ -1235,7 +1235,7 @@
 	purple_notify_user_info_add_section_break(user_info);
 	tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
 			profile_url_text, _("View web profile"));
-	purple_notify_user_info_add_pair(user_info, NULL, tmp);
+	purple_notify_user_info_add_pair_html(user_info, NULL, tmp);
 	g_free(tmp);
 
 	g_free(stripped);
--- a/libpurple/protocols/zephyr/zephyr.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Mon Aug 22 02:23:28 2011 +0000
@@ -793,7 +793,7 @@
 
 				/* 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(user_info, _("User"), (b ? bname : user));
+				purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user));
 				balias = purple_buddy_get_local_buddy_alias(b);
 				if (b && balias)
 					purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
@@ -807,7 +807,7 @@
 					ZGetLocations(&locs, &one);
 					/* TODO: Need to escape locs.host and locs.time? */
 					tmp = g_strdup_printf(_("<br>At %s since %s"), locs.host, locs.time);
-					purple_notify_user_info_add_pair(user_info, _("Location"), tmp);
+					purple_notify_user_info_add_pair_html(user_info, _("Location"), tmp);
 					g_free(tmp);
 				}
 				purple_notify_userinfo(gc, (b ? bname : user),
@@ -1178,7 +1178,7 @@
 
 					/* 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(user_info, _("User"), (b ? bname : user));
+					purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user));
 
 					balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL;
 					if (balias)
@@ -1191,7 +1191,7 @@
 						tmp = g_strdup_printf(_("<br>At %s since %s"),
 									  tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents,
 									  tree_child(tree_child(tree_child(tree_child(locations,2),0),2),2)->contents);
-						purple_notify_user_info_add_pair(user_info, _("Location"), tmp);
+						purple_notify_user_info_add_pair_html(user_info, _("Location"), tmp);
 						g_free(tmp);
 					}
 
--- a/libpurple/util.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/libpurple/util.c	Mon Aug 22 02:23:28 2011 +0000
@@ -1321,7 +1321,7 @@
 				g_string_append_len(dest, p, q - p);
 		}
 
-		purple_notify_user_info_add_pair(user_info, display_name, dest->str);
+		purple_notify_user_info_add_pair_html(user_info, display_name, dest->str);
 		g_string_free(dest, TRUE);
 
 		return TRUE;
--- a/pidgin/gtkblist.c	Mon Aug 22 02:11:36 2011 +0000
+++ b/pidgin/gtkblist.c	Mon Aug 22 02:23:28 2011 +0000
@@ -3913,7 +3913,7 @@
 			/* Total buddies (from online accounts) in group */
 			char tmp2[12];
 			sprintf(tmp2, "%d", count);
-			purple_notify_user_info_add_pair(user_info,
+			purple_notify_user_info_add_pair_html(user_info,
 					_("Total Buddies"), tmp2);
 		}