# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1137729464 0
# Node ID 384661a6ead66abcc44433527da17f3fe17e13d1
# Parent  53cde84095990359d43910b3839d35b6a1fb8811
[gaim-migrate @ 15321]
Fix things to match some signal callbacks.
Fix conversation-switched to actually use the right handle.

committer: Tailor Script <tailor@pidgin.im>

diff -r 53cde8409599 -r 384661a6ead6 plugins/notify.c
--- a/plugins/notify.c	Fri Jan 20 03:46:26 2006 +0000
+++ b/plugins/notify.c	Fri Jan 20 03:57:44 2006 +0000
@@ -250,7 +250,7 @@
 }
 
 static void
-im_sent_im(GaimAccount *account, char *receiver, const char *message) {
+im_sent_im(GaimAccount *account, const char *receiver, const char *message) {
 	GaimConversation *conv = NULL;
 
 	if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/notify_send")) {
@@ -364,7 +364,7 @@
 }
 
 static void
-conv_switched(GaimConversation *old_conv, GaimConversation *new_conv)
+conv_switched(GaimConversation *conv)
 {
 #if 0
 	GaimGtkWindow *gaimwin = gaim_conversation_get_window(new_conv);
@@ -374,7 +374,7 @@
 	 * If the conversation was switched, then make sure we re-notify
 	 * because Gaim will have overwritten our custom window title.
 	 */
-	notify(new_conv, FALSE);
+	notify(conv, FALSE);
 
 #if 0
 	printf("conv_switched - %p - %p\n", old_conv, new_conv);
@@ -766,9 +766,11 @@
 	my_plugin = plugin;
 
 	gaim_signal_connect(gtk_conv_handle, "displayed-im-msg", plugin,
-						GAIM_CALLBACK(message_displayed_cb), NULL);
+	                    GAIM_CALLBACK(message_displayed_cb), NULL);
 	gaim_signal_connect(gtk_conv_handle, "displayed-chat-msg", plugin,
-						GAIM_CALLBACK(message_displayed_cb), NULL);
+	                    GAIM_CALLBACK(message_displayed_cb), NULL);
+	gaim_signal_connect(gtk_conv_handle, "conversation-switched", plugin,
+	                    GAIM_CALLBACK(conv_switched), NULL);
 	gaim_signal_connect(conv_handle, "sent-im-msg", plugin,
 	                    GAIM_CALLBACK(im_sent_im), NULL);
 	gaim_signal_connect(conv_handle, "sent-chat-msg", plugin,
@@ -779,8 +781,6 @@
 	                    GAIM_CALLBACK(conv_created), NULL);
 	gaim_signal_connect(conv_handle, "deleting-conversation", plugin,
 	                    GAIM_CALLBACK(deleting_conv), NULL);
-	gaim_signal_connect(conv_handle, "conversation-switched", plugin,
-	                    GAIM_CALLBACK(conv_switched), NULL);
 #if 0
 	gaim_signal_connect(gtk_conv_handle, "conversation-dragging", plugin,
 	                    GAIM_CALLBACK(conversation_dragging), NULL);