diff src/gtkconv.c @ 10824:8d52201620d0

[gaim-migrate @ 12488] This changes gaim_conv_window_remove_conversation to take a GaimConversion pointer to remore instead of an index. Every place just called a function to get the index before calling it anyway. This may or may not help the contact aware convo bugs, I didn't test it yet, but I believe it to be a step in the right direction. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Fri, 15 Apr 2005 00:28:54 +0000
parents d087e928ffd1
children 53e7884c549a
line wrap: on
line diff
--- a/src/gtkconv.c	Thu Apr 14 04:08:10 2005 +0000
+++ b/src/gtkconv.c	Fri Apr 15 00:28:54 2005 +0000
@@ -2250,8 +2250,8 @@
 			dest_win = gaim_conv_window_new();
 
 			gaim_conv_window_add_conversation(dest_win,
-					gaim_conv_window_remove_conversation(win,
-							gaim_conversation_get_index(conv)));
+			                                  gaim_conv_window_remove_conversation(win,
+			                                  conv));
 
 			dest_gtkwin = GAIM_GTK_WINDOW(dest_win);
 
@@ -2281,8 +2281,7 @@
 		else {
 			size_t pos;
 
-			gaim_conv_window_remove_conversation(win,
-				gaim_conversation_get_index(conv));
+			gaim_conv_window_remove_conversation(win, conv);
 
 			pos = gaim_conv_window_add_conversation(dest_win, conv);
 
@@ -4119,9 +4118,8 @@
 		if (c != NULL) {
 			GaimConvWindow *oldwin;
 			oldwin = gaim_conversation_get_window(c);
-			index = gaim_conversation_get_index(c);
 			if (oldwin != win) {
-				gaim_conv_window_remove_conversation(oldwin, index);
+				gaim_conv_window_remove_conversation(oldwin, c);
 				gaim_conv_window_add_conversation(win, c);
 			}
 		} else {