Merge branch 'adium-events'

Conflicts:
	libempathy-gtk/empathy-theme-adium.c

diff --cc libempathy-gtk/empathy-theme-adium.c
index 1a14679d26635d6bb3822e8de0eae2f80069710c,c1365579bb4b945ab016a649b4d8c851616a23ff..4e70fedb227f1f386f147d5ad880a2043d84941a
--- 1/libempathy-gtk/empathy-theme-adium.c
--- 2/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@@ -484,10 -505,10 +506,11 @@@ theme_adium_append_message (EmpathyChat
        if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
                gchar *str;
  
 -              str = g_strdup_printf ("%s %s", name, body);
 +              str = g_strdup_printf ("%s %s", name, body_escaped);
-               empathy_chat_view_append_event (view, str);
+               theme_adium_append_event_escaped (view, str);
++
                g_free (str);
 -              g_free (dup_body);
 +              g_free (body_escaped);
                return;
        }