/pidgin/main: 9553d50ea702: Fix displaying default smileys

[Tomasz Wasilczyk]

Changeset: 9553d50ea7023c108fdfee833b2f32fbf06e2f0f
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-02 00:51 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/9553d50ea702

Description:

Fix displaying default smileys

diffstat:

 pidgin/smileyparser.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff --git a/pidgin/smileyparser.c b/pidgin/smileyparser.c
--- a/pidgin/smileyparser.c
+++ b/pidgin/smileyparser.c
@@ -157,7 +157,9 @@ smiley_parse_markup(const char *markup, 
 	}
 
 	for (list = current_smiley_theme->list; list; list = list->next) {
-		if (g_str_equal(list->sml, proto_name)) {
+		if (g_str_equal(list->sml, "default") ||
+			g_str_equal(list->sml, proto_name))
+		{
 			temp2 = parse_for_smiley_list(temp, list->files);
 			g_free(temp);
 			temp = temp2;