diff: libpurple/smiley-parser.c
libpurple/smiley-parser.c
- changeset 35717
- 45bde03f86a6
- parent 35716
- 80bedd712883
- child 35739
- cb9acfd6fa1e
--- a/libpurple/smiley-parser.c Wed Apr 02 02:15:56 2014 +0200 +++ b/libpurple/smiley-parser.c Wed Apr 02 02:37:34 2014 +0200 @@ -69,7 +69,10 @@ if (message == NULL || message[0] == '\0') return g_strdup(message); - custom_trie = purple_smiley_custom_get_trie(); + custom_trie = purple_smiley_list_get_trie( + purple_smiley_custom_get_list()); + if (purple_trie_get_size(custom_trie) == 0) + custom_trie = NULL; theme = purple_smiley_theme_get_current(); if (theme != NULL)
