[empathy: 2/2] Merge branch 'adium-events'

[Xavier Claessens <xclaesse src gnome org>]

commit 9ff14672ab605f20789a2db6f9f89673cf8f2c4b
Merge: 078aa4b... 0b86e86...
Author: Xavier Claessens <xclaesse gmail com>
Date:   Thu Nov 26 10:20:40 2009 +0100

    Merge branch 'adium-events'
    
    Conflicts:
    	libempathy-gtk/empathy-theme-adium.c

 libempathy-gtk/empathy-theme-adium.c |   48 +++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 20 deletions(-)
---
diff --cc libempathy-gtk/empathy-theme-adium.c
index 1a14679,c136557..4e70fed
--- a/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;
  	}