pidgin: f536c69f: Rename purple_notify_user_info_add_pair ...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sun Aug 21 22:26:01 EDT 2011
----------------------------------------------------------------------
Revision: f536c69fd56e64f098d00973c020536105f63095
Parent: 9f33b5ce2c74e058158c6c9964d6abba2dff8dc6
Author: markdoliner at pidgin.im
Date: 08/21/11 22:23:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f536c69fd56e64f098d00973c020536105f63095
Changelog:
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.
Changes against parent 9f33b5ce2c74e058158c6c9964d6abba2dff8dc6
patched libpurple/notify.c
patched libpurple/notify.h
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/irc/msgs.c
patched libpurple/protocols/jabber/buddy.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/mxit/profile.c
patched libpurple/protocols/myspace/user.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/oscar/userinfo.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/silc/buddy.c
patched libpurple/protocols/silc/ops.c
patched libpurple/protocols/yahoo/yahoo_profile.c
patched libpurple/protocols/zephyr/zephyr.c
patched libpurple/util.c
patched pidgin/gtkblist.c
-------------- next part --------------
============================================================
--- libpurple/util.c 933911b13d247fcdf4116fd1d9edc9438c112b19
+++ libpurple/util.c 2c2e02bfc21ec20a99176958dc93bdd6a3394d4e
@@ -1321,7 +1321,7 @@ purple_markup_extract_info_field(const c
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;
============================================================
--- libpurple/protocols/jabber/jabber.c 4fcdb7d60afc72f69ecc1f35334e1fbd2fc64c3c
+++ libpurple/protocols/jabber/jabber.c 1273648d9cc2187cae93e7b66a7aad403236d818
@@ -2225,7 +2225,7 @@ jabber_tooltip_add_resource_text(JabberB
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 @@ void jabber_tooltip_text(PurpleBuddy *b,
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 @@ void jabber_tooltip_text(PurpleBuddy *b,
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 @@ void jabber_tooltip_text(PurpleBuddy *b,
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);
}
}
}
============================================================
--- libpurple/protocols/msn/msn.c e760e518a3d2e4a2254fa874844f28127936216a
+++ libpurple/protocols/msn/msn.c 1925449a3b60c83199e784559beb3278f2c7221b
@@ -1078,7 +1078,7 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
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 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
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 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
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 @@ msn_tooltip_extract_info_text(PurpleNoti
{
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 @@ msn_got_info(PurpleUtilFetchUrlData *url
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 @@ msn_got_info(PurpleUtilFetchUrlData *url
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 @@ msn_got_info(PurpleUtilFetchUrlData *url
char *p = strstr(url_buffer, "<form id=\"profile_form\" name=\"profile_form\" action=\"http://spaces.live.com/profile.aspx?cid=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 @@ msn_got_info(PurpleUtilFetchUrlData *url
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
============================================================
--- libpurple/protocols/oscar/oscar.c 88e52792fd7abb2ba491f94585107e1ace7dd981
+++ libpurple/protocols/oscar/oscar.c f88b38ac26f0cdb2d3bcd81cd3627c784e516579
@@ -2297,9 +2297,9 @@ static int purple_parse_clientauto_ch4(O
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 @@ static int purple_parse_clientauto_ch4(O
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);
============================================================
--- libpurple/protocols/zephyr/zephyr.c b33993e182a9633a5fea940ac81e572ed92084c8
+++ libpurple/protocols/zephyr/zephyr.c c5a870d8b26f8fef962ffd6d41fa2cb4310e8116
@@ -793,7 +793,7 @@ static void handle_message(PurpleConnect
/* 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 @@ static void handle_message(PurpleConnect
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 @@ static gint check_notify_tzc(gpointer da
/* 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 @@ static gint check_notify_tzc(gpointer da
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);
}
============================================================
--- libpurple/protocols/gg/gg.c 816b84cde9826e6e3b1d59e565dc74472a4d3cd9
+++ libpurple/protocols/gg/gg.c b6b618b409796ef134a291cb0a34801a92fdfab6
@@ -1200,31 +1200,31 @@ static void ggp_pubdir_handle_info(Purpl
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);
============================================================
--- pidgin/gtkblist.c c5433e9f7a3557bc4615affd034ce9ad048ec49a
+++ pidgin/gtkblist.c ec271b7fed7c7b688a67a87f24cf6413c41d7bc9
@@ -3913,7 +3913,7 @@ static char *pidgin_get_tooltip_text(Pur
/* 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);
}
============================================================
--- libpurple/notify.c c85874bc666c48982ebbf7d0fc9e22ef457f9320
+++ libpurple/notify.c 63418436656841ae28473e277f41c06b9b9ad061
@@ -575,7 +575,7 @@ void
}
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_plainte
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
============================================================
--- libpurple/notify.h 0c2a4c7b6eef596269ae1f3607a6389f4c6280d6
+++ libpurple/notify.h 962debbef8f5772977725c5d40ad4f0945c6c9fc
@@ -480,16 +480,10 @@ char *purple_notify_user_info_get_text_w
* 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 @@ void purple_notify_user_info_remove_entr
*
* 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.
*
============================================================
--- libpurple/protocols/irc/msgs.c 4cc8f7a8afd962199f4d75aa136dcc77e13ed84b
+++ libpurple/protocols/irc/msgs.c 5af44182adf1b67f71eb62c9ca0dcc769865a661
@@ -352,7 +352,7 @@ void irc_msg_endwhois(struct irc_conn *i
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);
============================================================
--- libpurple/protocols/jabber/buddy.c 272999ff7312c0cccd5651a760b0ee028a3aa68c
+++ libpurple/protocols/jabber/buddy.c 6fe8c5115c4b17c65cf014d969afaea63562d770
@@ -1136,7 +1136,7 @@ static void jabber_vcard_parse(JabberStr
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 @@ static void jabber_vcard_parse(JabberStr
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 @@ static void jabber_vcard_parse(JabberStr
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);
============================================================
--- libpurple/protocols/novell/novell.c 5a5d2611cee1e74ea401055c41b2c59be08533cc
+++ libpurple/protocols/novell/novell.c 1eadb18d6040bed8931e12b1638227f57c60cf9e
@@ -1517,7 +1517,7 @@ _show_info(PurpleConnection * gc, NMUser
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 @@ _show_info(PurpleConnection * gc, NMUser
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 @@ _show_info(PurpleConnection * gc, NMUser
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 @@ _show_info(PurpleConnection * gc, NMUser
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 @@ novell_tooltip_text(PurpleBuddy * buddy,
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);
}
}
}
============================================================
--- libpurple/protocols/silc/buddy.c 249e3ab2c4130ef6a119cd9a3f07dbe77dc28ea8
+++ libpurple/protocols/silc/buddy.c f1de313190053bd43d1dad332cdb0df703822fa9
@@ -1549,13 +1549,13 @@ void silcpurple_tooltip_text(PurpleBuddy
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 @@ void silcpurple_tooltip_text(PurpleBuddy
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 @@ void silcpurple_tooltip_text(PurpleBuddy
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);
}
}
============================================================
--- libpurple/protocols/silc/ops.c 19a51eb495673253e50eeea1d980e2809392d002
+++ libpurple/protocols/silc/ops.c ebfa3b56a12fe493cd9c109896cc607b49466f33
@@ -1202,14 +1202,14 @@ silc_command_reply(SilcClient client, Si
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 @@ silc_command_reply(SilcClient client, Si
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 @@ silc_command_reply(SilcClient client, Si
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);
}
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c 9b69e1e524b62a25bc32670292a0b87b449de98a
+++ libpurple/protocols/yahoo/yahoo_profile.c 45c4628e0fe695b04377da2061a22c473636f724
@@ -805,7 +805,7 @@ static void yahoo_got_info(PurpleUtilFet
* 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 @@ static void yahoo_got_info(PurpleUtilFet
_("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 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
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 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
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 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
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);
============================================================
--- libpurple/protocols/sametime/sametime.c d7c99de708e0cb5734678f08e7afd0de77675ebf
+++ libpurple/protocols/sametime/sametime.c 93d12d579831ca6ea9f24770b9bf7a2ee563696f
@@ -4198,7 +4198,7 @@ static void mw_prpl_get_info(PurpleConne
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 @@ static void mw_prpl_get_info(PurpleConne
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 @@ static void mw_prpl_get_info(PurpleConne
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);
}
}
============================================================
--- libpurple/protocols/bonjour/bonjour.c 1236ebd5c5b5cab668cd0f72ca7fec64554cbaf1
+++ libpurple/protocols/bonjour/bonjour.c a35cb3fab8c4877f943c31f64fad53a6d95e1bcb
@@ -375,7 +375,7 @@ bonjour_tooltip_text(PurpleBuddy *buddy,
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 @@ bonjour_tooltip_text(PurpleBuddy *buddy,
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);
}
}
============================================================
--- libpurple/protocols/myspace/user.c bc68d62014e3cb8aeb99c6e2515ce70335aa714d
+++ libpurple/protocols/myspace/user.c 94ed54c3d0cfff30e4bbee1cf2482495502081f2
@@ -206,7 +206,7 @@ msim_append_user_info(MsimSession *sessi
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);
}
}
============================================================
--- libpurple/protocols/mxit/mxit.c 50033e28bdbab07e045996165ae4516f5c488776
+++ libpurple/protocols/mxit/mxit.c 99e0162713a147af741a4144d309ec5183c4b4f7
@@ -346,7 +346,7 @@ static void mxit_tooltip( PurpleBuddy* b
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 @@ static void mxit_tooltip( PurpleBuddy* b
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 );
}
}
============================================================
--- libpurple/protocols/mxit/profile.c 57b53b2467d279f961ea095f8fb3c4cae9eb01a7
+++ libpurple/protocols/mxit/profile.c 375d93aaa6c0af1240775ce33043916b4e0e0d8d
@@ -177,12 +177,12 @@ void mxit_show_profile( struct MXitSessi
/* 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 @@ void mxit_show_profile( struct MXitSessi
/* 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 @@ void mxit_show_profile( struct MXitSessi
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 @@ void mxit_show_profile( struct MXitSessi
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 );
}
}
}
============================================================
--- libpurple/protocols/oscar/userinfo.c f85af49b16c35a0b92dbd94a057dddaf487ccab9
+++ libpurple/protocols/oscar/userinfo.c c47a311acf25b21964d38e8a82bc2eb22465d6b0
@@ -140,7 +140,7 @@ oscar_user_info_convert_and_add(PurpleAc
/* 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 @@ oscar_user_info_convert_and_add_hyperlin
/* 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 @@ oscar_user_info_append_status(PurpleConn
} 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 @@ oscar_user_info_display_aim(OscarData *o
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 @@ oscar_user_info_display_aim(OscarData *o
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);
More information about the Commits
mailing list