comparison: libpurple/smiley-parser.c
libpurple/smiley-parser.c
- changeset 35717
- 45bde03f86a6
- parent 35716
- 80bedd712883
- child 35739
- cb9acfd6fa1e
equal
deleted
inserted
replaced
| 35716:80bedd712883 | 35717:45bde03f86a6 |
|---|---|
| 67 GSList *tries = NULL, tries_theme, tries_custom; | 67 GSList *tries = NULL, tries_theme, tries_custom; |
| 68 | 68 |
| 69 if (message == NULL || message[0] == '\0') | 69 if (message == NULL || message[0] == '\0') |
| 70 return g_strdup(message); | 70 return g_strdup(message); |
| 71 | 71 |
| 72 custom_trie = purple_smiley_custom_get_trie(); | 72 custom_trie = purple_smiley_list_get_trie( |
| 73 purple_smiley_custom_get_list()); | |
| 74 if (purple_trie_get_size(custom_trie) == 0) | |
| 75 custom_trie = NULL; | |
| 73 | 76 |
| 74 theme = purple_smiley_theme_get_current(); | 77 theme = purple_smiley_theme_get_current(); |
| 75 if (theme != NULL) | 78 if (theme != NULL) |
| 76 theme_smileys = purple_smiley_theme_get_smileys(theme, ui_data); | 79 theme_smileys = purple_smiley_theme_get_smileys(theme, ui_data); |
| 77 | 80 |
