Don't escape message before detecting smileys otherwise some won't be detected.

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 2b2504ffdf8c900a840274c049c95ac52608c4f0..da0028e4ec001e95e2ab20a872dba99cd242abb1 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -217,16 +217,14 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
        gchar                 *ret = NULL;
        gint                   prev;
 
-       ret = g_markup_escape_text (text, -1);
-
        empathy_conf_get_bool (empathy_conf_get (),
                               EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
                               &use_smileys);
 
        if (use_smileys) {
                /* Replace smileys by a <img/> tag */
-               string = g_string_sized_new (strlen (ret));
-               smileys = empathy_smiley_manager_parse (priv->smiley_manager, ret);
+               string = g_string_sized_new (strlen (text));
+               smileys = empathy_smiley_manager_parse (priv->smiley_manager, text);
                for (l = smileys; l; l = l->next) {
                        EmpathySmiley *smiley;
 
@@ -236,13 +234,14 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
                                                        "<abbr title='%s'><img src=\"%s\"/ alt=\"%s\"/></abbr>",
                                                        smiley->str, smiley->path, smiley->str);
                        } else {
-                               g_string_append (string, smiley->str);
+                               ret = g_markup_escape_text (smiley->str, -1);
+                               g_string_append (string, ret);
+                               g_free (ret);
                        }
                        empathy_smiley_free (smiley);
                }
                g_slist_free (smileys);
 
-               g_free (ret);
                ret = g_string_free (string, FALSE);
        }