Mercurial > pidgin
changeset 28954:68cd5a8a3ffe
merge of '12cc2cc3c1e0012329832ea2d170dca5b31f8b9b'
and 'bd023f94e67f08aef22c1e266f1cd1eac0dfd998'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 03 Feb 2010 21:37:42 +0000 |
| parents | bf0db10b0e3c (diff) 3422481df7ba (current diff) |
| children | 57550ffb7870 |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Wed Feb 03 21:17:30 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Wed Feb 03 21:37:42 2010 +0000 @@ -985,6 +985,7 @@ gchar *smileyfied_xhtml = NULL; const GList *iterator; GList *valid_smileys = NULL; + gboolean has_too_large_smiley = FALSE; for (iterator = found_smileys; iterator ; iterator = g_list_next(iterator)) { @@ -1011,15 +1012,16 @@ } valid_smileys = g_list_append(valid_smileys, smiley); } else { - gchar *msg = - g_strdup_printf(_("Custom smiley with shortcut %s is too large to send."), - purple_smiley_get_shortcut(smiley)); - purple_conversation_write(conv, NULL, msg, - PURPLE_MESSAGE_ERROR, time(NULL)); - g_free(msg); + has_too_large_smiley = TRUE; } } + if (has_too_large_smiley) { + purple_conversation_write(conv, NULL, + _("A custom smiley in the message is too large to send."), + PURPLE_MESSAGE_ERROR, time(NULL)); + } + smileyfied_xhtml = jabber_message_get_smileyfied_xhtml(xhtml, valid_smileys); g_list_free(found_smileys);