Mercurial > pidgin.yaz
diff libpurple/protocols/sametime/sametime.c @ 23709:27eacd38c721
Add NULL checking to purple_markup_linkify().
Display meanwhile announcements that don't have message text associated (I'm
not sure if this is right, the current code doesn't allow for that scenario).
Fixes #6518
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 07 Aug 2008 01:08:37 +0000 |
| parents | 6fe3a32c5ee9 |
| children | 16734635febf 6757bffb3d3a 4bc74deeb503 |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Wed Aug 06 15:50:04 2008 +0000 +++ b/libpurple/protocols/sametime/sametime.c Thu Aug 07 01:08:37 2008 +0000 @@ -1816,7 +1816,7 @@ who = g_strdup_printf(_("Announcement from %s"), who); msg = purple_markup_linkify(text); - purple_conversation_write(conv, who, msg, PURPLE_MESSAGE_RECV, time(NULL)); + purple_conversation_write(conv, who, msg ? msg : "", PURPLE_MESSAGE_RECV, time(NULL)); g_free(who); g_free(msg); }