Mercurial > pidgin.yaz

comparison libpurple/protocols/zephyr/zephyr.c @ 32366:99ca503ea087

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename purple_notify_user_info_add_pair to purple_notify_user_info_add_pair_html, to be more explicit so hopefully people don't pass this non-html in the future.
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 02:23:28 +0000
parents e8d4755ef84b
children 5fd35afcfcbf
comparison
equal deleted inserted replaced
32365:e8d4755ef84b 32366:99ca503ea087
791 char *tmp; 791 char *tmp;
792 const char *balias; 792 const char *balias;
793 793
794 /* TODO: Check whether it's correct to call add_pair_html, 794 /* TODO: Check whether it's correct to call add_pair_html,
795 or if we should be using add_pair_plaintext */ 795 or if we should be using add_pair_plaintext */
796 purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user)); 796 purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user));
797 balias = purple_buddy_get_local_buddy_alias(b); 797 balias = purple_buddy_get_local_buddy_alias(b);
798 if (b && balias) 798 if (b && balias)
799 purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias); 799 purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
800 800
801 if (!nlocs) { 801 if (!nlocs) {
805 /* XXX add real error reporting */ 805 /* XXX add real error reporting */
806 806
807 ZGetLocations(&locs, &one); 807 ZGetLocations(&locs, &one);
808 /* TODO: Need to escape locs.host and locs.time? */ 808 /* TODO: Need to escape locs.host and locs.time? */
809 tmp = g_strdup_printf(_("<br>At %s since %s"), locs.host, locs.time); 809 tmp = g_strdup_printf(_("<br>At %s since %s"), locs.host, locs.time);
810 purple_notify_user_info_add_pair(user_info, _("Location"), tmp); 810 purple_notify_user_info_add_pair_html(user_info, _("Location"), tmp);
811 g_free(tmp); 811 g_free(tmp);
812 } 812 }
813 purple_notify_userinfo(gc, (b ? bname : user), 813 purple_notify_userinfo(gc, (b ? bname : user),
814 user_info, NULL, NULL); 814 user_info, NULL, NULL);
815 purple_notify_user_info_destroy(user_info); 815 purple_notify_user_info_destroy(user_info);
1176 char *tmp; 1176 char *tmp;
1177 const char *balias; 1177 const char *balias;
1178 1178
1179 /* TODO: Check whether it's correct to call add_pair_html, 1179 /* TODO: Check whether it's correct to call add_pair_html,
1180 or if we should be using add_pair_plaintext */ 1180 or if we should be using add_pair_plaintext */
1181 purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user)); 1181 purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user));
1182 1182
1183 balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL; 1183 balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL;
1184 if (balias) 1184 if (balias)
1185 purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias); 1185 purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
1186 1186
1189 } else { 1189 } else {
1190 /* TODO: Need to escape the two strings that make up tmp? */ 1190 /* TODO: Need to escape the two strings that make up tmp? */
1191 tmp = g_strdup_printf(_("<br>At %s since %s"), 1191 tmp = g_strdup_printf(_("<br>At %s since %s"),
1192 tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents, 1192 tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents,
1193 tree_child(tree_child(tree_child(tree_child(locations,2),0),2),2)->contents); 1193 tree_child(tree_child(tree_child(tree_child(locations,2),0),2),2)->contents);
1194 purple_notify_user_info_add_pair(user_info, _("Location"), tmp); 1194 purple_notify_user_info_add_pair_html(user_info, _("Location"), tmp);
1195 g_free(tmp); 1195 g_free(tmp);
1196 } 1196 }
1197 1197
1198 purple_notify_userinfo(gc, b ? bname : user, 1198 purple_notify_userinfo(gc, b ? bname : user,
1199 user_info, NULL, NULL); 1199 user_info, NULL, NULL);