Mercurial > pidgin
changeset 4643:2b37c498b4bd
[gaim-migrate @ 4953]
Paco-Paco fixed a bug, and I fixed a bug. We're quite the bug-fixing bunch.
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 03 Mar 2003 20:03:39 +0000 |
parents | c0abcd675ca6 |
children | 0192482ffbdb |
files | src/protocols/oscar/oscar.c |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Mon Mar 03 08:31:55 2003 +0000 +++ b/src/protocols/oscar/oscar.c Mon Mar 03 20:03:39 2003 +0000 @@ -3538,8 +3538,9 @@ if (info->numaddresses && info->email2) { int i; for (i = 0; i < info->numaddresses; i++) { - if (info->email2[i] && info->email2[i][0]) + if (info->email2[i] && info->email2[i][0]) { tmp = buf; buf = g_strconcat(tmp, "\n<br><b>Email Address:</b> <a href=\"mailto:", info->email2[i], "\">", info->email2[i], "</a>", NULL); g_free(tmp); + } } } if (info->mobile && info->mobile[0]) { @@ -5481,6 +5482,10 @@ char *charset; /* If anything goes wrong, fall back on ASCII and print a message */ + if (enc == NULL) { + debug_printf("Encoding was null, that's odd\n"); + return 0; + } charset = strstr(enc, "charset="); if (charset == NULL) { debug_printf("No charset specified for info, assuming ASCII\n");