Mercurial > pidgin3 / file diff

--- a/finch/gntsound.c	Sat Jun 29 03:40:25 2013 +0530
+++ b/finch/gntsound.c	Sat Jun 29 04:37:14 2013 +0530
@@ -218,8 +218,8 @@
 }
 
 static void
-chat_buddy_join_cb(PurpleChatConversation *chat, const char *name,
-				   PurpleChatConversationBuddyFlags flags, gboolean new_arrival,
+chat_user_join_cb(PurpleChatConversation *chat, const char *name,
+				   PurpleChatUserFlags flags, gboolean new_arrival,
 				   PurpleSoundEventID event)
 {
 	if (new_arrival && !chat_nick_matches_name(chat, name))
@@ -227,7 +227,7 @@
 }
 
 static void
-chat_buddy_left_cb(PurpleChatConversation *chat, const char *name,
+chat_user_left_cb(PurpleChatConversation *chat, const char *name,
 				   const char *reason, PurpleSoundEventID event)
 {
 	if (!chat_nick_matches_name(chat, name))
@@ -398,11 +398,11 @@
 	purple_signal_connect(conv_handle, "sent-im-msg",
 						gnt_sound_handle, PURPLE_CALLBACK(im_msg_sent_cb),
 						GINT_TO_POINTER(PURPLE_SOUND_SEND));
-	purple_signal_connect(conv_handle, "chat-buddy-joined",
-						gnt_sound_handle, PURPLE_CALLBACK(chat_buddy_join_cb),
+	purple_signal_connect(conv_handle, "chat-user-joined",
+						gnt_sound_handle, PURPLE_CALLBACK(chat_user_join_cb),
 						GINT_TO_POINTER(PURPLE_SOUND_CHAT_JOIN));
-	purple_signal_connect(conv_handle, "chat-buddy-left",
-						gnt_sound_handle, PURPLE_CALLBACK(chat_buddy_left_cb),
+	purple_signal_connect(conv_handle, "chat-user-left",
+						gnt_sound_handle, PURPLE_CALLBACK(chat_user_left_cb),
 						GINT_TO_POINTER(PURPLE_SOUND_CHAT_LEAVE));
 	purple_signal_connect(conv_handle, "sent-chat-msg",
 						gnt_sound_handle, PURPLE_CALLBACK(chat_msg_sent_cb),