pidgin: 89cf48c2: I went through all our calls to purple_n...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sun Aug 21 22:25:59 EDT 2011
----------------------------------------------------------------------
Revision: 89cf48c2a62e7c39e8aba3ee2bd90e3ac440151d
Parent: 53a1e640d1450261d9ad2c46d8205c9e79443336
Author: markdoliner at pidgin.im
Date: 08/21/11 21:53:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/89cf48c2a62e7c39e8aba3ee2bd90e3ac440151d
Changelog:
I went through all our calls to purple_notify_user_info_add_pair() and
checked whether they should be purple_notify_user_info_add_pair_plaintext(),
instead. If it wasn't immediately obvious one way or the other then I
left a comment to investigate. I suspect there are still a lot of places
where we should use the _plaintext function to escape the value.
Changes against parent 53a1e640d1450261d9ad2c46d8205c9e79443336
patched finch/gntblist.c
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/gg/gg.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/null/nullprpl.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/zephyr/zephyr.c
patched pidgin/gtkblist.c
patched pidgin/gtkutils.c
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c 0cbb4809cdbe8070d787e4850137d233b6cc1dcd
+++ libpurple/protocols/msn/msn.c e760e518a3d2e4a2254fa874844f28127936216a
@@ -1091,16 +1091,18 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
}
} else {
if (purple_presence_is_idle(presence)) {
- purple_notify_user_info_add_pair(user_info, _("Status"),
- _("Idle"));
+ purple_notify_user_info_add_pair_plaintext(user_info,
+ _("Status"), _("Idle"));
} else {
- purple_notify_user_info_add_pair(user_info, _("Status"),
- purple_status_get_name(status));
+ purple_notify_user_info_add_pair_plaintext(user_info,
+ _("Status"), purple_status_get_name(status));
}
}
}
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);
g_free(currentmedia);
}
@@ -1119,23 +1121,32 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
{
const char *phone;
- purple_notify_user_info_add_pair(user_info, _("Has you"),
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Has you"),
((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
- purple_notify_user_info_add_pair(user_info, _("Blocked"),
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Blocked"),
((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));
phone = msn_user_get_home_phone(user);
- if (phone != NULL)
+ 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);
+ }
phone = msn_user_get_work_phone(user);
- if (phone != NULL)
+ 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);
+ }
phone = msn_user_get_mobile_phone(user);
- if (phone != NULL)
+ 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);
+ }
}
}
@@ -2705,7 +2716,7 @@ msn_got_info(PurpleUtilFetchUrlData *url
(purple_connection_get_account(info_data->gc), info_data->name);
purple_notify_user_info_add_pair(user_info,
_("Error retrieving profile"), NULL);
- purple_notify_user_info_add_pair(user_info, NULL,
+ purple_notify_user_info_add_pair_plaintext(user_info, NULL,
((p && b) ? _("The user has not created a public profile.") :
(p ? _("MSN reported not being able to find the user's profile. "
"This either means that the user does not exist, "
============================================================
--- libpurple/protocols/oscar/oscar.c 52b1a6aa506b5e0a94b78911ab7ba2f2c0cb4ffe
+++ libpurple/protocols/oscar/oscar.c 88e52792fd7abb2ba491f94585107e1ace7dd981
@@ -2278,7 +2278,7 @@ purple_parse_clientauto_ch2(OscarData *o
return 0;
}
-static int purple_parse_clientauto_ch4(OscarData *od, char *who, guint16 reason, guint32 state, char *msg) {
+static int purple_parse_clientauto_ch4(OscarData *od, const char *who, guint16 reason, guint32 state, char *msg) {
PurpleConnection *gc = od->gc;
switch(reason) {
@@ -2286,13 +2286,17 @@ static int purple_parse_clientauto_ch4(O
char *statusmsg, **splitmsg;
PurpleNotifyUserInfo *user_info;
+ statusmsg = oscar_icqstatus(state);
+
/* Split at (carriage return/newline)'s, then rejoin later with BRs between. */
- statusmsg = oscar_icqstatus(state);
+ /* TODO: Don't we need to escape each piece? */
splitmsg = g_strsplit(msg, "\r\n", 0);
user_info = purple_notify_user_info_new();
- purple_notify_user_info_add_pair(user_info, _("UIN"), who);
+ 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_section_break(user_info);
purple_notify_user_info_add_pair(user_info, NULL, g_strjoinv("<BR>", splitmsg));
@@ -2309,13 +2313,17 @@ static int purple_parse_clientauto_ch4(O
char *statusmsg, **splitmsg;
PurpleNotifyUserInfo *user_info;
+ statusmsg = oscar_icqstatus(state);
+
/* Split at (carriage return/newline)'s, then rejoin later with BRs between. */
- statusmsg = oscar_icqstatus(state);
+ /* TODO: Don't we need to escape each piece? */
splitmsg = g_strsplit(msg, "\r\n", 0);
user_info = purple_notify_user_info_new();
- purple_notify_user_info_add_pair(user_info, _("UIN"), who);
+ 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_section_break(user_info);
purple_notify_user_info_add_pair(user_info, NULL, g_strjoinv("<BR>", splitmsg));
============================================================
--- libpurple/protocols/zephyr/zephyr.c 0fdd0d9dad0859eb0b9c3f2670eebea3afb8314b
+++ libpurple/protocols/zephyr/zephyr.c 371255a3ecc53ff32ed9de04b04a9289e6e75ed2
@@ -791,18 +791,21 @@ static void handle_message(PurpleConnect
char *tmp;
const char *balias;
+ /* 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));
balias = purple_buddy_get_local_buddy_alias(b);
if (b && balias)
- purple_notify_user_info_add_pair(user_info, _("Alias"), balias);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
if (!nlocs) {
- purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in"));
+ purple_notify_user_info_add_pair_plaintext(user_info, NULL, _("Hidden or not logged-in"));
}
for (; nlocs > 0; nlocs--) {
/* XXX add real error reporting */
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);
g_free(tmp);
@@ -1173,15 +1176,18 @@ static gint check_notify_tzc(gpointer da
char *tmp;
const char *balias;
+ /* 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));
balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL;
if (balias)
- purple_notify_user_info_add_pair(user_info, _("Alias"), balias);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
if (!nlocs) {
- purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in"));
+ purple_notify_user_info_add_pair_plaintext(user_info, NULL, _("Hidden or not logged-in"));
} else {
+ /* TODO: Need to escape the two strings that make up tmp? */
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);
============================================================
--- libpurple/protocols/gg/gg.c d398445e62f438fd236d2b35c7e6eead382c2975
+++ libpurple/protocols/gg/gg.c 816b84cde9826e6e3b1d59e565dc74472a4d3cd9
@@ -1194,26 +1194,36 @@ static void ggp_pubdir_handle_info(Purpl
val = ggp_search_get_result(req, 0, GG_PUBDIR50_STATUS);
/* XXX: Use of ggp_str_to_uin() is an ugly hack! */
- purple_notify_user_info_add_pair(user_info, _("Status"), ggp_status_by_id(ggp_str_to_uin(val)));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), ggp_status_by_id(ggp_str_to_uin(val)));
g_free(val);
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);
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);
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);
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);
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);
}
g_free(val);
@@ -1225,15 +1235,12 @@ static void ggp_pubdir_handle_info(Purpl
if (NULL != buddy) {
PurpleStatus *status;
const char *msg;
- char *text;
status = purple_presence_get_active_status(purple_buddy_get_presence(buddy));
msg = purple_status_get_attr_string(status, "message");
if (msg != NULL) {
- text = g_markup_escape_text(msg, -1);
- purple_notify_user_info_add_pair(user_info, _("Message"), text);
- g_free(text);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Message"), msg);
}
}
@@ -1975,7 +1982,7 @@ static void ggp_tooltip_text(PurpleBuddy
static void ggp_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full)
{
PurpleStatus *status;
- char *text, *tmp;
+ char *tmp;
const char *msg, *name, *alias;
g_return_if_fail(b != NULL);
@@ -1985,21 +1992,19 @@ static void ggp_tooltip_text(PurpleBuddy
name = purple_status_get_name(status);
alias = purple_buddy_get_alias(b);
- purple_notify_user_info_add_pair (user_info, _("Alias"), alias);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), alias);
if (msg != NULL) {
- text = g_markup_escape_text(msg, -1);
if (PURPLE_BUDDY_IS_ONLINE(b)) {
- tmp = g_strdup_printf("%s: %s", name, text);
- purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
+ tmp = g_strdup_printf("%s: %s", name, msg);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), tmp);
g_free(tmp);
} else {
- purple_notify_user_info_add_pair(user_info, _("Message"), text);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Message"), msg);
}
- g_free(text);
/* We don't want to duplicate 'Status: Offline'. */
} else if (PURPLE_BUDDY_IS_ONLINE(b)) {
- purple_notify_user_info_add_pair(user_info, _("Status"), name);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), name);
}
}
@@ -2030,7 +2035,7 @@ static GList *ggp_status_types(PurpleAcc
NULL);
types = g_list_append(types, type);
- /*
+ /*
* New statuses for GG 8.0 like PoGGadaj ze mna (not yet because
* libpurple can't support Chatty status) and Nie przeszkadzac
*/
============================================================
--- pidgin/gtkutils.c 009d5385cf6591fb86828fdf1b1a6ccb484bab23
+++ pidgin/gtkutils.c 65592f2d9db13a6eec6d9fa1efcb8a52e65004b1
@@ -984,7 +984,7 @@ show_retrieveing_info(PurpleConnection *
show_retrieveing_info(PurpleConnection *conn, const char *name)
{
PurpleNotifyUserInfo *info = purple_notify_user_info_new();
- purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+ purple_notify_user_info_add_pair_plaintext(info, _("Information"), _("Retrieving..."));
purple_notify_userinfo(conn, name, info, NULL, NULL);
purple_notify_user_info_destroy(info);
}
============================================================
--- pidgin/gtkblist.c ec8abc91a9cfa8fe64b93d1b44f58a8dbbbe1202
+++ pidgin/gtkblist.c c5433e9f7a3557bc4615affd034ce9ad048ec49a
@@ -3774,10 +3774,8 @@ static char *pidgin_get_tooltip_text(Pur
connections = purple_connections_get_all();
if (full && connections && connections->next)
{
- tmp = g_markup_escape_text(purple_account_get_username(
- purple_buddy_get_account(b)), -1);
- purple_notify_user_info_add_pair(user_info, _("Account"), tmp);
- g_free(tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Account"),
+ purple_account_get_username(purple_buddy_get_account(b)));
}
/* Alias */
@@ -3787,9 +3785,8 @@ static char *pidgin_get_tooltip_text(Pur
(c->alias != NULL && c->alias[0] != '\0') &&
strcmp(c->alias, b->alias) != 0)
{
- tmp = g_markup_escape_text(b->alias, -1);
- purple_notify_user_info_add_pair(user_info, _("Buddy Alias"), tmp);
- g_free(tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info,
+ _("Buddy Alias"), b->alias);
}
/* Nickname/Server Alias */
@@ -3799,9 +3796,8 @@ static char *pidgin_get_tooltip_text(Pur
* to look at the tooltip. */
if (full && b->server_alias != NULL && b->server_alias[0] != '\0')
{
- tmp = g_markup_escape_text(b->server_alias, -1);
- purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp);
- g_free(tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info,
+ _("Nickname"), b->server_alias);
}
/* Logged In */
@@ -3817,7 +3813,7 @@ static char *pidgin_get_tooltip_text(Pur
tmp = g_strdup(purple_date_format_long(localtime(&signon)));
} else
tmp = purple_str_seconds_to_string(time(NULL) - signon);
- purple_notify_user_info_add_pair(user_info, _("Logged In"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Logged In"), tmp);
g_free(tmp);
}
@@ -3828,7 +3824,7 @@ static char *pidgin_get_tooltip_text(Pur
if (idle_secs > 0)
{
tmp = purple_str_seconds_to_string(time(NULL) - idle_secs);
- purple_notify_user_info_add_pair(user_info, _("Idle"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Idle"), tmp);
g_free(tmp);
}
}
@@ -3863,7 +3859,7 @@ static char *pidgin_get_tooltip_text(Pur
if (lastseen > 0)
{
tmp = purple_str_seconds_to_string(time(NULL) - lastseen);
- purple_notify_user_info_add_pair(user_info, _("Last Seen"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Last Seen"), tmp);
g_free(tmp);
}
}
@@ -3873,7 +3869,7 @@ static char *pidgin_get_tooltip_text(Pur
/* FIXME: Why is this status special-cased by the core? --rlaager
* FIXME: Alternatively, why not have the core do all of them? --rlaager */
if (!PURPLE_BUDDY_IS_ONLINE(b)) {
- purple_notify_user_info_add_pair(user_info, _("Status"), _("Offline"));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Offline"));
}
if (purple_account_is_connected(b->account) &&
@@ -3885,11 +3881,11 @@ static char *pidgin_get_tooltip_text(Pur
/* These are Easter Eggs. Patches to remove them will be rejected. */
if (!g_ascii_strcasecmp(b->name, "robflynn"))
- purple_notify_user_info_add_pair(user_info, _("Description"), _("Spooky"));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Description"), _("Spooky"));
if (!g_ascii_strcasecmp(b->name, "seanegn"))
- purple_notify_user_info_add_pair(user_info, _("Status"), _("Awesome"));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Awesome"));
if (!g_ascii_strcasecmp(b->name, "chipx86"))
- purple_notify_user_info_add_pair(user_info, _("Status"), _("Rockin'"));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Rockin'"));
tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
g_string_append(str, tmp);
@@ -3904,24 +3900,21 @@ static char *pidgin_get_tooltip_text(Pur
user_info = purple_notify_user_info_new();
count = purple_blist_get_group_online_count(group);
-
if (count != 0) {
/* Online buddies in group */
- tmp = g_strdup_printf("%d", count);
- purple_notify_user_info_add_pair(user_info,
- _("Online Buddies"),
- tmp);
- g_free(tmp);
+ char tmp2[12];
+ sprintf(tmp2, "%d", count);
+ purple_notify_user_info_add_pair_plaintext(user_info,
+ _("Online Buddies"), tmp2);
}
count = purple_blist_get_group_size(group, FALSE);
if (count != 0) {
/* Total buddies (from online accounts) in group */
- tmp = g_strdup_printf("%d", count);
+ char tmp2[12];
+ sprintf(tmp2, "%d", count);
purple_notify_user_info_add_pair(user_info,
- _("Total Buddies"),
- tmp);
- g_free(tmp);
+ _("Total Buddies"), tmp2);
}
tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
============================================================
--- libpurple/protocols/novell/novell.c 38d97475ce77c0fcd31ea0debd9b13c48d2a152b
+++ libpurple/protocols/novell/novell.c 5a5d2611cee1e74ea401055c41b2c59be08533cc
@@ -1515,19 +1515,26 @@ _show_info(PurpleConnection * gc, NMUser
tag = _("User ID");
value = nm_user_record_get_userid(user_record);
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);
}
-/* tag = _("DN");
+#if 0
+ tag = _("DN");
value = nm_user_record_get_dn(user_record);
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);
}
-*/
+#endif /* if 0 */
tag = _("Full name");
value = nm_user_record_get_full_name(user_record);
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);
}
@@ -1538,6 +1545,8 @@ _show_info(PurpleConnection * gc, NMUser
tag = _map_property_tag(nm_property_get_tag(property));
value = nm_property_get_value(property);
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);
}
nm_release_property(property);
@@ -2860,10 +2869,13 @@ novell_tooltip_text(PurpleBuddy * buddy,
break;
}
- purple_notify_user_info_add_pair(user_info, _("Status"), status_str);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status_str);
- if (text)
+ 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);
+ }
}
}
}
============================================================
--- libpurple/protocols/silc/buddy.c 89ccb9e622662ed10abe428430f8cbff3fbd2fdd
+++ libpurple/protocols/silc/buddy.c 249e3ab2c4130ef6a119cd9a3f07dbe77dc28ea8
@@ -1547,53 +1547,71 @@ void silcpurple_tooltip_text(PurpleBuddy
return;
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"),
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);
}
if (client_entry->mode) {
memset(tmp, 0, sizeof(tmp));
silcpurple_get_umode_string(client_entry->mode,
tmp, sizeof(tmp) - strlen(tmp));
- purple_notify_user_info_add_pair(user_info, _("User Modes"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("User Modes"), tmp);
}
silcpurple_parse_attrs(client_entry->attrs, &moodstr, &statusstr, &contactstr, &langstr, &devicestr, &tzstr, &geostr);
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);
g_free(statusstr);
}
if (full) {
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);
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);
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);
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);
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);
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);
g_free(geostr);
}
============================================================
--- libpurple/protocols/silc/ops.c 4858bfe02aa534943ce720f6a4302d0eb40fafb9
+++ libpurple/protocols/silc/ops.c 19a51eb495673253e50eeea1d980e2809392d002
@@ -1162,7 +1162,7 @@ silc_command_reply(SilcClient client, Si
SilcUInt32 idle, *user_modes;
SilcDList channels;
SilcClientEntry client_entry;
- char tmp[1024], *tmp2;
+ char tmp[1024];
char *moodstr, *statusstr, *contactstr, *langstr, *devicestr, *tzstr, *geostr;
PurpleNotifyUserInfo *user_info;
@@ -1184,71 +1184,80 @@ silc_command_reply(SilcClient client, Si
user_modes = va_arg(ap, SilcUInt32 *);
user_info = purple_notify_user_info_new();
- tmp2 = g_markup_escape_text(client_entry->nickname, -1);
- purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp2);
- g_free(tmp2);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Nickname"), client_entry->nickname);
if (client_entry->realname) {
- tmp2 = g_markup_escape_text(client_entry->realname, -1);
- purple_notify_user_info_add_pair(user_info, _("Real Name"), tmp2);
- g_free(tmp2);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Real Name"), client_entry->realname);
}
- tmp2 = g_markup_escape_text(client_entry->username, -1);
if (*client_entry->hostname) {
- gchar *tmp3;
- tmp3 = g_strdup_printf("%s@%s", tmp2, client_entry->hostname);
- purple_notify_user_info_add_pair(user_info, _("Username"), tmp3);
- g_free(tmp3);
+ gchar *tmp2;
+ tmp2 = g_strdup_printf("%s@%s", client_entry->username, client_entry->hostname);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Username"), tmp2);
+ g_free(tmp2);
} else
- purple_notify_user_info_add_pair(user_info, _("Username"), tmp2);
- g_free(tmp2);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Username"), client_entry->username);
if (client_entry->mode) {
memset(tmp, 0, sizeof(tmp));
silcpurple_get_umode_string(client_entry->mode,
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);
}
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);
g_free(moodstr);
}
if (statusstr) {
- tmp2 = g_markup_escape_text(statusstr, -1);
- purple_notify_user_info_add_pair(user_info, _("Status Text"), tmp2);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status Text"), statusstr);
g_free(statusstr);
- g_free(tmp2);
}
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);
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);
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);
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);
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);
g_free(geostr);
}
- if (*client_entry->server)
+ 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);
+ }
if (channels && user_modes) {
SilcChannelPayload entry;
@@ -1266,9 +1275,7 @@ silc_command_reply(SilcClient client, Si
silc_strncat(tmp, sizeof(tmp) - 1, " ", 1);
silc_free(m);
}
- tmp2 = g_markup_escape_text(tmp, -1);
- purple_notify_user_info_add_pair(user_info, _("Currently on"), tmp2);
- g_free(tmp2);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Currently on"), tmp);
}
if (client_entry->public_key) {
@@ -1279,8 +1286,8 @@ silc_command_reply(SilcClient client, Si
if (pk) {
fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
- purple_notify_user_info_add_pair(user_info, _("Public Key Fingerprint"), fingerprint);
- purple_notify_user_info_add_pair(user_info, _("Public Key Babbleprint"), babbleprint);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Public Key Fingerprint"), fingerprint);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Public Key Babbleprint"), babbleprint);
silc_free(fingerprint);
silc_free(babbleprint);
silc_free(pk);
@@ -1304,7 +1311,7 @@ silc_command_reply(SilcClient client, Si
case SILC_COMMAND_WHOWAS:
{
SilcClientEntry client_entry;
- char *nickname, *realname, *username, *tmp;
+ char *nickname, *realname, *username;
PurpleNotifyUserInfo *user_info;
if (status != SILC_STATUS_OK) {
@@ -1322,27 +1329,23 @@ silc_command_reply(SilcClient client, Si
break;
user_info = purple_notify_user_info_new();
- tmp = g_markup_escape_text(nickname, -1);
- purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp);
- g_free(tmp);
- if (realname) {
- tmp = g_markup_escape_text(realname, -1);
- purple_notify_user_info_add_pair(user_info, _("Real Name"), tmp);
- g_free(tmp);
- }
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Nickname"), nickname);
+ if (realname)
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Real Name"), realname);
if (username) {
- tmp = g_markup_escape_text(username, -1);
if (client_entry && *client_entry->hostname) {
- gchar *tmp3;
- tmp3 = g_strdup_printf("%s@%s", tmp, client_entry->hostname);
- purple_notify_user_info_add_pair(user_info, _("Username"), tmp3);
- g_free(tmp3);
+ gchar *tmp;
+ tmp = g_strdup_printf("%s@%s", username, client_entry->hostname);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Username"), tmp);
+ g_free(tmp);
} else
- purple_notify_user_info_add_pair(user_info, _("Username"), tmp);
- g_free(tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Username"), username);
}
- if (client_entry && *client_entry->server)
+ 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);
+ }
if (client_entry && client_entry->public_key) {
@@ -1353,8 +1356,8 @@ silc_command_reply(SilcClient client, Si
if (pk) {
fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
- purple_notify_user_info_add_pair(user_info, _("Public Key Fingerprint"), fingerprint);
- purple_notify_user_info_add_pair(user_info, _("Public Key Babbleprint"), babbleprint);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Public Key Fingerprint"), fingerprint);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Public Key Babbleprint"), babbleprint);
silc_free(fingerprint);
silc_free(babbleprint);
silc_free(pk);
============================================================
--- libpurple/protocols/sametime/sametime.c 8323b41480ee4922cf533e35e6e0920933c4879e
+++ libpurple/protocols/sametime/sametime.c a13ac515898a542b37e4c4e48c0a6ef8a3278745
@@ -3337,13 +3337,13 @@ static void mw_prpl_tooltip_text(PurpleB
purple_notify_user_info_add_pair_plaintext(user_info, status, message);
} else {
- purple_notify_user_info_add_pair(user_info, _("Status"), status);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status);
}
if(full && pd != NULL) {
tmp = user_supports_text(pd->srvc_aware, purple_buddy_get_name(b));
if(tmp) {
- purple_notify_user_info_add_pair(user_info, _("Supports"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Supports"), tmp);
g_free(tmp);
}
@@ -4201,43 +4201,44 @@ static void mw_prpl_get_info(PurpleConne
purple_notify_user_info_add_pair(user_info, _("External User"), NULL);
}
- purple_notify_user_info_add_pair(user_info, _("User ID"), who);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("User ID"), who);
if(b) {
guint32 type;
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));
}
type = purple_blist_node_get_int((PurpleBlistNode *) b, BUDDY_KEY_CLIENT);
if(type) {
- tmp = g_strdup(mw_client_name(type));
- if (!tmp)
+ tmp2 = mw_client_name(type);
+ if (tmp2) {
+ 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);
-
- g_free(tmp);
+ purple_notify_user_info_add_pair(user_info, _("Last Known Client"), tmp);
+ g_free(tmp);
+ }
}
}
tmp = user_supports_text(pd->srvc_aware, who);
if(tmp) {
- purple_notify_user_info_add_pair(user_info, _("Supports"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Supports"), tmp);
g_free(tmp);
}
if(b) {
- purple_notify_user_info_add_pair(user_info, _("Status"), status_text(b));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status_text(b));
/* XXX Is this adding a status message in its own section rather than with the "Status" label? */
tmp2 = mwServiceAware_getText(pd->srvc_aware, &idb);
if(tmp2 && g_utf8_validate(tmp2, -1, NULL)) {
- tmp = g_markup_escape_text(tmp2, -1);
purple_notify_user_info_add_section_break(user_info);
- purple_notify_user_info_add_pair(user_info, NULL, tmp);
- g_free(tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, NULL, tmp2);
}
}
============================================================
--- libpurple/protocols/bonjour/bonjour.c 866646a997078df617aefb7e8d034549fdb6a34e
+++ libpurple/protocols/bonjour/bonjour.c 1236ebd5c5b5cab668cd0f72ca7fec64554cbaf1
@@ -371,9 +371,12 @@ bonjour_tooltip_text(PurpleBuddy *buddy,
else
status_description = purple_status_get_name(status);
- purple_notify_user_info_add_pair(user_info, _("Status"), status_description);
- if (message != NULL)
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status_description);
+ 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);
+ }
if (bb == NULL) {
purple_debug_error("bonjour", "Got tooltip request for a buddy without protocol data.\n");
@@ -382,20 +385,35 @@ bonjour_tooltip_text(PurpleBuddy *buddy,
/* Only show first/last name if there is a nickname set (to avoid duplication) */
if (bb->nick != NULL && *bb->nick != '\0') {
- if (bb->first != NULL && *bb->first != '\0')
+ 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);
- if (bb->last != NULL && *bb->last != '\0')
+ }
+ 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);
+ }
}
- if (bb->email != NULL && *bb->email != '\0')
+ 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);
+ }
- if (bb->AIM != NULL && *bb->AIM != '\0')
+ 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);
+ }
- if (bb->jid != NULL && *bb->jid != '\0')
+ 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);
+ }
}
static void
============================================================
--- finch/gntblist.c b84805c84bbdb9efc7f992128395b4f30b63c511
+++ finch/gntblist.c 31b88d14b2571e126fffb572f157242e2553d18d
@@ -1268,7 +1268,7 @@ gpointer finch_retrieve_user_info(Purple
{
PurpleNotifyUserInfo *info = purple_notify_user_info_new();
gpointer uihandle;
- purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+ purple_notify_user_info_add_pair_plaintext(info, _("Information"), _("Retrieving..."));
uihandle = purple_notify_userinfo(conn, name, info, NULL, NULL);
purple_notify_user_info_destroy(info);
@@ -1783,15 +1783,13 @@ tooltip_for_buddy(PurpleBuddy *buddy, GS
presence = purple_buddy_get_presence(buddy);
if (!full || g_utf8_collate(purple_buddy_get_name(buddy), alias)) {
- char *esc = g_markup_escape_text(alias, -1);
- purple_notify_user_info_add_pair(user_info, _("Nickname"), esc);
- g_free(esc);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Nickname"), alias);
}
tmp = g_strdup_printf("%s (%s)",
purple_account_get_username(account),
purple_account_get_protocol_name(account));
- purple_notify_user_info_add_pair(user_info, _("Account"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Account"), tmp);
g_free(tmp);
prpl = purple_find_prpl(purple_account_get_protocol_id(account));
@@ -1806,7 +1804,7 @@ tooltip_for_buddy(PurpleBuddy *buddy, GS
time_t idle = purple_presence_get_idle_time(pre);
if (idle > 0) {
char *st = purple_str_seconds_to_string(time(NULL) - idle);
- purple_notify_user_info_add_pair(user_info, _("Idle"), st);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Idle"), st);
g_free(st);
}
}
============================================================
--- libpurple/protocols/null/nullprpl.c 800e756ec6fbe1079eda476b8dcebfbcbc9725d0
+++ libpurple/protocols/null/nullprpl.c 0cbd5c0bc598c3b8ae77e5d5efe1d7ee6070083d
@@ -258,6 +258,8 @@ static void nullprpl_tooltip_text(Purple
PurplePresence *presence = purple_buddy_get_presence(buddy);
PurpleStatus *status = purple_presence_get_active_status(presence);
char *msg = nullprpl_status_text(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(info, purple_status_get_name(status),
msg);
g_free(msg);
@@ -265,12 +267,14 @@ static void nullprpl_tooltip_text(Purple
if (full) {
const char *user_info = purple_account_get_user_info(gc->account);
if (user_info)
+ /* 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, _("User info"), user_info);
}
} else {
/* they're not logged in */
- purple_notify_user_info_add_pair(info, _("User info"), _("not logged in"));
+ purple_notify_user_info_add_pair_plaintext(info, _("User info"), _("not logged in"));
}
purple_debug_info("nullprpl", "showing %s tooltip for %s\n",
@@ -510,6 +514,8 @@ static void nullprpl_get_info(PurpleConn
body = purple_account_get_user_info(acct);
else
body = _("No user info.");
+ /* 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, "Info", body);
/* show a buddy's user info in a nice dialog box */
============================================================
--- libpurple/protocols/myspace/user.c 52dc40e4ca42c45d8178864f812cd4e8edb01e10
+++ libpurple/protocols/myspace/user.c bc68d62014e3cb8aeb99c6e2515ce70335aa714d
@@ -128,15 +128,21 @@ msim_append_user_info(MsimSession *sessi
}
if (user->gender && *user->gender) {
+ /* 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_plaintext(user_info, _("Gender"), user->gender);
}
if (user->location && *user->location) {
+ /* 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_plaintext(user_info, _("Location"), user->location);
}
/* Other information */
if (user->headline && *user->headline) {
+ /* 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_plaintext(user_info, _("Headline"), user->headline);
}
@@ -153,6 +159,8 @@ msim_append_user_info(MsimSession *sessi
str = msim_format_now_playing(artist, title);
if (str && *str) {
+ /* 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_plaintext(user_info, _("Song"), str);
}
g_free(str);
@@ -180,8 +188,11 @@ msim_append_user_info(MsimSession *sessi
} else if (cv) {
client = g_strdup_printf("Build %d", cv);
}
- if (client && *client)
+ if (client && *client) {
+ /* 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_plaintext(user_info, _("Client Version"), client);
+ }
g_free(client);
}
============================================================
--- libpurple/protocols/mxit/mxit.c 1f0ac1099ae0ae02428fed56dc33894b027d7e54
+++ libpurple/protocols/mxit/mxit.c 50033e28bdbab07e045996165ae4516f5c488776
@@ -340,23 +340,29 @@ static void mxit_tooltip( PurpleBuddy* b
/* status (reference: "libpurple/notify.h") */
if ( contact->presence != MXIT_PRESENCE_OFFLINE )
- purple_notify_user_info_add_pair( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
/* status message */
- if ( contact->statusMsg )
+ 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 );
+ }
/* mood */
if ( contact->mood != MXIT_MOOD_NONE )
- purple_notify_user_info_add_pair( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
/* subscription type */
if ( contact->subtype != 0 )
- purple_notify_user_info_add_pair( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
+ 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 ) )
+ 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 );
+ }
}
============================================================
--- libpurple/protocols/mxit/profile.c 992bab615d8d81b047848e8a06cc5ca98df1aece
+++ libpurple/protocols/mxit/profile.c 43fd7ca50b614dd23e82c98c2c0d6298fc2fb282
@@ -170,51 +170,70 @@ void mxit_show_profile( struct MXitSessi
buddy = purple_find_buddy( session->acc, username );
if ( buddy ) {
- purple_notify_user_info_add_pair( info, _( "Alias" ), purple_buddy_get_alias( buddy ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Alias" ), purple_buddy_get_alias( buddy ) );
purple_notify_user_info_add_section_break( info );
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( 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 );
g_free( tmp );
- purple_notify_user_info_add_pair( info, _( "Gender" ), profile->male ? _( "Male" ) : _( "Female" ) );
+ 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( 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 );
+ /* 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 );
- if ( strlen( profile->aboutme ) > 0 )
+ if ( strlen( profile->aboutme ) > 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( info, _( "About Me" ), profile->aboutme );
- if ( strlen( profile->whereami ) > 0 )
+ }
+ if ( strlen( profile->whereami ) > 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( info, _( "Where I Live" ), profile->whereami );
+ }
purple_notify_user_info_add_section_break( info );
if ( contact ) {
/* presence */
- purple_notify_user_info_add_pair( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
/* last online */
if ( contact->presence == MXIT_PRESENCE_OFFLINE )
- purple_notify_user_info_add_pair( info, _( "Last Online" ), ( profile->lastonline == 0 ) ? _( "Unknown" ) : datetime( profile->lastonline ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Last Online" ), ( profile->lastonline == 0 ) ? _( "Unknown" ) : datetime( profile->lastonline ) );
/* mood */
if ( contact->mood != MXIT_MOOD_NONE )
- purple_notify_user_info_add_pair( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
else
- purple_notify_user_info_add_pair( info, _( "Mood" ), _( "None" ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Mood" ), _( "None" ) );
/* status message */
- if ( contact->statusMsg )
+ 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 );
+ }
/* subscription type */
- purple_notify_user_info_add_pair( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
+ purple_notify_user_info_add_pair_plaintext( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
}
else {
/* this is an invite */
@@ -222,18 +241,25 @@ void mxit_show_profile( struct MXitSessi
if ( contact ) {
/* invite found */
- if ( contact->msg )
+ 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 );
+ }
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 );
+ g_free(img_text);
}
- if ( contact->statusMsg )
+ 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 );
+ }
}
}
============================================================
--- libpurple/protocols/oscar/userinfo.c bb698785d1daddeca46d2b89d178514aeb618356
+++ libpurple/protocols/oscar/userinfo.c f85af49b16c35a0b92dbd94a057dddaf487ccab9
@@ -131,20 +131,15 @@ static void
}
static void
-oscar_user_info_add_pair(PurpleNotifyUserInfo *user_info, const char *name, const char *value)
-{
- if (value && value[0]) {
- purple_notify_user_info_add_pair(user_info, name, value);
- }
-}
-
-static void
oscar_user_info_convert_and_add(PurpleAccount *account, OscarData *od, PurpleNotifyUserInfo *user_info,
const char *name, const char *value)
{
gchar *utf8;
if (value && value[0] && (utf8 = oscar_utf8_try_convert(account, od, value))) {
+ /* 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);
g_free(utf8);
}
@@ -158,6 +153,9 @@ oscar_user_info_convert_and_add_hyperlin
if (value && value[0] && (utf8 = oscar_utf8_try_convert(account, od, value))) {
gchar *tmp = g_strdup_printf("<a href=\"%s%s\">%s</a>", url_prefix, utf8, utf8);
+ /* 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);
g_free(utf8);
g_free(tmp);
@@ -340,19 +338,19 @@ oscar_user_info_append_extra_info(Purple
bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn));
if ((bi != NULL) && (bi->ipaddr != 0)) {
- tmp = g_strdup_printf("%hhu.%hhu.%hhu.%hhu",
- (bi->ipaddr & 0xff000000) >> 24,
- (bi->ipaddr & 0x00ff0000) >> 16,
- (bi->ipaddr & 0x0000ff00) >> 8,
- (bi->ipaddr & 0x000000ff));
- oscar_user_info_add_pair(user_info, _("IP Address"), tmp);
- g_free(tmp);
+ char tmp2[40];
+ sprintf(tmp2, "%hhu.%hhu.%hhu.%hhu",
+ (bi->ipaddr & 0xff000000) >> 24,
+ (bi->ipaddr & 0x00ff0000) >> 16,
+ (bi->ipaddr & 0x0000ff00) >> 8,
+ (bi->ipaddr & 0x000000ff));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tmp2);
}
if ((userinfo != NULL) && (userinfo->warnlevel != 0)) {
- tmp = g_strdup_printf("%d", (int)(userinfo->warnlevel/10.0 + .5));
- oscar_user_info_add_pair(user_info, _("Warning Level"), tmp);
- g_free(tmp);
+ char tmp2[12];
+ sprintf(tmp2, "%d", (int)(userinfo->warnlevel/10.0 + .5));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Warning Level"), tmp2);
}
if ((b != NULL) && (bname != NULL) && (g != NULL) && (gname != NULL)) {
@@ -372,7 +370,7 @@ oscar_user_info_display_error(OscarData
{
PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
gchar *buf = g_strdup_printf(_("User information not available: %s"), oscar_get_msgerr_reason(error_reason));
- purple_notify_user_info_add_pair(user_info, NULL, buf);
+ purple_notify_user_info_add_pair_plaintext(user_info, NULL, buf);
purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL);
purple_notify_user_info_destroy(user_info);
purple_conv_present_error(buddy, purple_connection_get_account(od->gc), buf);
@@ -402,16 +400,16 @@ oscar_user_info_display_icq(OscarData *o
else
bi = NULL;
- purple_notify_user_info_add_pair(user_info, _("UIN"), who);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("UIN"), who);
oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick);
if ((bi != NULL) && (bi->ipaddr != 0)) {
- char *tstr = g_strdup_printf("%hhu.%hhu.%hhu.%hhu",
- (bi->ipaddr & 0xff000000) >> 24,
- (bi->ipaddr & 0x00ff0000) >> 16,
- (bi->ipaddr & 0x0000ff00) >> 8,
- (bi->ipaddr & 0x000000ff));
- purple_notify_user_info_add_pair(user_info, _("IP Address"), tstr);
- g_free(tstr);
+ char tstr[40];
+ sprintf(tstr, "%hhu.%hhu.%hhu.%hhu",
+ (bi->ipaddr & 0xff000000) >> 24,
+ (bi->ipaddr & 0x00ff0000) >> 16,
+ (bi->ipaddr & 0x0000ff00) >> 8,
+ (bi->ipaddr & 0x000000ff));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr);
}
oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first);
oscar_user_info_convert_and_add(account, od, user_info, _("Last Name"), info->last);
@@ -425,7 +423,7 @@ oscar_user_info_display_icq(OscarData *o
oscar_user_info_convert_and_add(account, od, user_info, _("Mobile Phone"), info->mobile);
if (info->gender != 0)
- purple_notify_user_info_add_pair(user_info, _("Gender"), (info->gender == 1 ? _("Female") : _("Male")));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Gender"), (info->gender == 1 ? _("Female") : _("Male")));
if ((info->birthyear > 1900) && (info->birthmonth > 0) && (info->birthday > 0)) {
/* Initialize the struct properly or strftime() will crash
@@ -437,7 +435,7 @@ oscar_user_info_display_icq(OscarData *o
tm->tm_mon = (int)info->birthmonth - 1;
tm->tm_year = (int)info->birthyear - 1900;
- /* Ignore dst setting of today to avoid timezone shift between
+ /* Ignore dst setting of today to avoid timezone shift between
* dates in summer and winter time. */
tm->tm_isdst = -1;
@@ -451,8 +449,9 @@ oscar_user_info_display_icq(OscarData *o
if ((info->age > 0) && (info->age < 255)) {
char age[5];
snprintf(age, sizeof(age), "%hhd", info->age);
- purple_notify_user_info_add_pair(user_info, _("Age"), age);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Age"), age);
}
+ /* TODO: Is it correct to pass info->email here...? */
oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Personal Web Page"), info->email, "");
if (buddy != NULL)
oscar_user_info_append_status(gc, user_info, buddy, /* aim_userinfo_t */ NULL, /* use_html_status */ TRUE);
@@ -482,6 +481,7 @@ oscar_user_info_display_icq(OscarData *o
oscar_user_info_convert_and_add(account, od, user_info, _("Company"), info->workcompany);
oscar_user_info_convert_and_add(account, od, user_info, _("Division"), info->workdivision);
oscar_user_info_convert_and_add(account, od, user_info, _("Position"), info->workposition);
+ /* TODO: Is it correct to pass info->email here...? */
oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Web Page"), info->email, "");
}
@@ -505,7 +505,7 @@ oscar_user_info_display_aim(OscarData *o
if ((userinfo->present & AIM_USERINFO_PRESENT_IDLE) && userinfo->idletime != 0) {
tmp = purple_str_seconds_to_string(userinfo->idletime*60);
- oscar_user_info_add_pair(user_info, _("Idle"), tmp);
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Idle"), tmp);
g_free(tmp);
}
@@ -514,17 +514,18 @@ oscar_user_info_display_aim(OscarData *o
if ((userinfo->present & AIM_USERINFO_PRESENT_ONLINESINCE) && !oscar_util_valid_name_sms(userinfo->bn)) {
/* An SMS contact is always online; its Online Since value is not useful */
time_t t = userinfo->onlinesince;
- oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
}
if (userinfo->present & AIM_USERINFO_PRESENT_MEMBERSINCE) {
time_t t = userinfo->membersince;
- oscar_user_info_add_pair(user_info, _("Member Since"), purple_date_format_full(localtime(&t)));
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Member Since"), purple_date_format_full(localtime(&t)));
}
if (userinfo->capabilities != 0) {
tmp = oscar_caps_to_string(userinfo->capabilities);
- oscar_user_info_add_pair(user_info, _("Capabilities"), tmp);
+ if (tmp && *tmp)
+ purple_notify_user_info_add_pair_plaintext(user_info, _("Capabilities"), tmp);
g_free(tmp);
}
@@ -533,7 +534,11 @@ oscar_user_info_display_aim(OscarData *o
info_utf8 = oscar_encoding_to_utf8(userinfo->info_encoding, userinfo->info, userinfo->info_len);
tmp = oscar_util_format_string(info_utf8, purple_account_get_username(account));
purple_notify_user_info_add_section_break(user_info);
- oscar_user_info_add_pair(user_info, _("Profile"), tmp);
+ 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);
+ }
g_free(tmp);
g_free(info_utf8);
}
More information about the Commits
mailing list