Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8791/src
Modified Files:
Tag: oldstatus
conversation.c
Log Message:
Clean up the comments surrounding auto-tab switching in oldstatus
(It's currently completely disabled, FYI)
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.630.2.9
retrieving revision 1.630.2.10
diff -u -d -p -r1.630.2.9 -r1.630.2.10
--- conversation.c 10 Jun 2005 01:55:57 -0000 1.630.2.9
+++ conversation.c 1 Jul 2005 04:55:27 -0000 1.630.2.10
@@ -1533,8 +1533,17 @@ gaim_conversation_write(GaimConversation
gaim_conversation_set_unseen(conv, unseen);
/*
- * If we received an IM, and the GaimConvWindow is not active,
- * then make this conversation the active tab in this GaimConvWindow.
+ * 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 inactive and
+ * minimized, then make this conversation the active tab in this
+ * GaimConvWindow.
*
* We do this so that, when the user comes back to the conversation
* window, the first thing they'll see is the new message. This is
@@ -1544,14 +1553,12 @@ gaim_conversation_write(GaimConversation
*/
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)))
{
- /*
- * This is auto-tab switching.
- * This is currently not enabled because people are lame. --Mark Doliner
- */
- /* gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv)); */
+ gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv));
}
+#endif
}
void
|
