# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1120193941 0
# Node ID 3f04018e1308cca50601120d02a43338b451c885
# Parent  61c7edaca9332f00fa7746716210398ce28a632f
[gaim-migrate @ 12976]
Disable auto-tab switching in HEAD and sync the comments with
those in oldstatus

committer: Tailor Script <tailor@pidgin.im>

diff -r 61c7edaca933 -r 3f04018e1308 src/conversation.c
--- a/src/conversation.c	Thu Jun 30 21:21:20 2005 +0000
+++ b/src/conversation.c	Fri Jul 01 04:59:01 2005 +0000
@@ -1366,6 +1366,14 @@
 	gaim_conversation_set_unseen(conv, unseen);
 
 	/*
+	 * TODO: This is #if 0'ed out because we don't have a way of
+	 *       telling if a conversation window is minimized.  This
+	 *       should probably be done in gtkconv.c anyway.
+	 */
+#if 0
+	/*
+	 * This is auto-tab switching.
+	 *
 	 * If we received an IM, and the GaimConvWindow is not active,
 	 * then make this conversation the active tab in this GaimConvWindow.
 	 *
@@ -1377,10 +1385,12 @@
 	 */
 	if ((gaim_conversation_get_type(conv) == GAIM_CONV_IM) &&
 		(flags & (GAIM_MESSAGE_RECV | GAIM_MESSAGE_ERROR)) &&
-		(!gaim_conv_window_has_focus(win)))
+		(!gaim_conv_window_has_focus(win)) &&
+		(gaim_conv_window_is_minimized(win)))
 	{
 		gaim_conv_window_switch_conversation(win, conv);
 	}
+#endif
 }
 
 void