Mercurial > pidgin.yaz
changeset 14093:b9e9938b1afa
[gaim-migrate @ 16719]
Get rid of two assertion failures and an accidentally double colon. I found
all three of these when getting the jabber info of quser.alpha.qunu.com while
trying to figure out http://trac.adiumx.com/ticket/4686
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 12 Aug 2006 11:15:23 +0000 |
| parents | 58c9f678b77a |
| children | d0f3eba2717c |
| files | src/protocols/jabber/buddy.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/jabber/buddy.c Sat Aug 12 10:59:13 2006 +0000 +++ b/src/protocols/jabber/buddy.c Sat Aug 12 11:15:23 2006 +0000 @@ -674,7 +674,7 @@ } if(jbr->client.name) { g_string_append_printf(info_text, "<b>%s:</b> %s %s<br/>", - _("Client:"), jbr->client.name, + _("Client"), jbr->client.name, jbr->client.version ? jbr->client.version : ""); if(jbr->client.os) { g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", @@ -688,7 +688,8 @@ g_free(resource_name); - info_text = g_string_append(info_text, jbi->vcard_text); + if (jbi->vcard_text != NULL) + info_text = g_string_append(info_text, jbi->vcard_text); gaim_notify_userinfo(jbi->js->gc, jbi->jid, info_text->str, NULL, NULL); @@ -699,7 +700,9 @@ g_string_free(info_text, TRUE); - gaim_timeout_remove(jbi->timeout_handle); + if (jbi->timeout_handle > 0) + gaim_timeout_remove(jbi->timeout_handle); + g_free(jbi->jid); g_hash_table_destroy(jbi->resources); g_free(jbi->vcard_text);