comparison 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 <[e-mail]>

10823:c1bb12625b3f

			gtkconv = GAIM_GTK_CONVERSATION(conv);

			dest_win = gaim_conv_window_new();

			gaim_conv_window_add_conversation(dest_win,
					gaim_conv_window_remove_conversation(win,
							gaim_conversation_get_index(conv)));

			dest_gtkwin = GAIM_GTK_WINDOW(dest_win);

			gtk_window_get_size(GTK_WINDOW(dest_gtkwin->window),
								&win_width, &win_height);

				gaim_conversation_get_index(conv), dest_page_num);
		}
		else {
			size_t pos;

			gaim_conv_window_remove_conversation(win,
				gaim_conversation_get_index(conv));

			pos = gaim_conv_window_add_conversation(dest_win, conv);

			if (pos != dest_page_num)
				gaim_conv_window_move_conversation(dest_win, pos, dest_page_num);

		 */
		c = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, b->account);
		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_add_conversation(win, c);
			}
		} else {
			c = gaim_conversation_new(GAIM_CONV_IM, b->account, b->name);
			gaim_conv_window_add_conversation(win, c);

10824:8d52201620d0

			gtkconv = GAIM_GTK_CONVERSATION(conv);

			dest_win = gaim_conv_window_new();

			gaim_conv_window_add_conversation(dest_win,
			                                  gaim_conv_window_remove_conversation(win,
			                                  conv));

			dest_gtkwin = GAIM_GTK_WINDOW(dest_win);

			gtk_window_get_size(GTK_WINDOW(dest_gtkwin->window),
								&win_width, &win_height);

				gaim_conversation_get_index(conv), dest_page_num);
		}
		else {
			size_t pos;

			gaim_conv_window_remove_conversation(win, conv);

			pos = gaim_conv_window_add_conversation(dest_win, conv);

			if (pos != dest_page_num)
				gaim_conv_window_move_conversation(dest_win, pos, dest_page_num);

		 */
		c = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, b->account);
		if (c != NULL) {
			GaimConvWindow *oldwin;
			oldwin = gaim_conversation_get_window(c);
			if (oldwin != win) {
				gaim_conv_window_remove_conversation(oldwin, c);
				gaim_conv_window_add_conversation(win, c);
			}
		} else {
			c = gaim_conversation_new(GAIM_CONV_IM, b->account, b->name);
			gaim_conv_window_add_conversation(win, c);