Mercurial > pidgin.yaz
comparison src/protocols/oscar/oscar.c @ 6173:1748679a5ee1
[gaim-migrate @ 6658]
Fix the available message crash
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 17 Jul 2003 05:01:17 +0000 |
parents | 11bedb793a44 |
children | ac191233b816 |
comparison
equal
deleted
inserted
replaced
6172:44ced441eb02 | 6173:1748679a5ee1 |
---|---|
5409 yay = g_strconcat(tmp, _("<b>Capabilities:</b> "), caps, "\n", NULL); | 5409 yay = g_strconcat(tmp, _("<b>Capabilities:</b> "), caps, "\n", NULL); |
5410 free(tmp); | 5410 free(tmp); |
5411 } | 5411 } |
5412 | 5412 |
5413 if (bi->availablemsg && !(b->uc & UC_UNAVAILABLE)) { | 5413 if (bi->availablemsg && !(b->uc & UC_UNAVAILABLE)) { |
5414 gchar *escaped = g_markup_escape_text(bi->availablemsg, strlen(bi->availablemsg)); | |
5414 tmp = yay; | 5415 tmp = yay; |
5415 yay = g_strconcat(tmp, _("<b>Available:</b> "), bi->availablemsg, "\n", NULL); | 5416 yay = g_strconcat(tmp, _("<b>Available:</b> "), escaped, "\n", NULL); |
5416 free(tmp); | 5417 free(tmp); |
5418 g_free(escaped); | |
5417 } | 5419 } |
5418 } | 5420 } |
5419 } else { | 5421 } else { |
5420 char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); | 5422 char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); |
5421 if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) { | 5423 if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) { |
5446 else | 5448 else |
5447 ret = g_strdup(_("Away")); | 5449 ret = g_strdup(_("Away")); |
5448 } else if (GAIM_BUDDY_IS_ONLINE(b)) { | 5450 } else if (GAIM_BUDDY_IS_ONLINE(b)) { |
5449 struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name)); | 5451 struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name)); |
5450 if (bi->availablemsg) | 5452 if (bi->availablemsg) |
5451 ret = g_strdup(bi->availablemsg); | 5453 ret = g_markup_escape_text(bi->availablemsg, strlen(bi->availablemsg)); |
5452 } else { | 5454 } else { |
5453 char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); | 5455 char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); |
5454 if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) | 5456 if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) |
5455 ret = g_strdup(_("Not Authorized")); | 5457 ret = g_strdup(_("Not Authorized")); |
5456 else | 5458 else |