diff -r 2e4dd08b0131 -r 63663622e327 pidgin/plugins/gtk-signals-test.c
--- a/pidgin/plugins/gtk-signals-test.c	Thu Jun 12 19:03:54 2014 +0200
+++ b/pidgin/plugins/gtk-signals-test.c	Thu Jun 12 21:00:05 2014 +0200
@@ -62,39 +62,39 @@
 }
 
 static gboolean
-displaying_im_msg_cb(PurpleAccount *account, const char *who, char **buffer,
-				PurpleConversation *conv, PurpleMessageFlags flags, void *data)
+displaying_im_msg_cb(PurpleConversation *conv, PurpleMessage *pmsg, gpointer data)
 {
 	purple_debug_misc("gtk-signals test", "displaying-im-msg (%s, %s)\n",
-					purple_conversation_get_name(conv), *buffer);
+		purple_conversation_get_name(conv),
+		purple_message_get_contents(pmsg));
 
 	return FALSE;
 }
 
 static void
-displayed_im_msg_cb(PurpleAccount *account, const char *who, const char *buffer,
-				PurpleConversation *conv, PurpleMessageFlags flags, void *data)
+displayed_im_msg_cb(PurpleConversation *conv, PurpleMessage *msg, gpointer data)
 {
 	purple_debug_misc("gtk-signals test", "displayed-im-msg (%s, %s)\n",
-					purple_conversation_get_name(conv), buffer);
+		purple_conversation_get_name(conv),
+		purple_message_get_contents(msg));
 }
 
 static gboolean
-displaying_chat_msg_cb(PurpleAccount *account, const char *who, char **buffer,
-				PurpleConversation *conv, PurpleMessageFlags flags, void *data)
+displaying_chat_msg_cb(PurpleConversation *conv, PurpleMessage *pmsg, gpointer data)
 {
 	purple_debug_misc("gtk-signals test", "displaying-chat-msg (%s, %s)\n",
-					purple_conversation_get_name(conv), *buffer);
+		purple_conversation_get_name(conv),
+		purple_message_get_contents(pmsg));
 
 	return FALSE;
 }
 
 static void
-displayed_chat_msg_cb(PurpleAccount *account, const char *who, const char *buffer,
-				PurpleConversation *conv, PurpleMessageFlags flags, void *data)
+displayed_chat_msg_cb(PurpleConversation *conv, PurpleMessage *msg, gpointer data)
 {
 	purple_debug_misc("gtk-signals test", "displayed-chat-msg (%s, %s)\n",
-					purple_conversation_get_name(conv), buffer);
+		purple_conversation_get_name(conv),
+		purple_message_get_contents(msg));
 }
 
 static void