[Gaim-commits] CVS: gaim/src gtkconv.c,1.471.2.23,1.471.2.24

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31018/src

Modified Files:
      Tag: oldstatus
	gtkconv.c 
Log Message:
If we received an IM, and the GaimConvWindow is not active,
then make this conversation the active tab in this GaimConvWindow.

See RedHat bugzilla bug #159267 for the reason.

This is the keystone of Gaim's world domination plan.
Or something along those lines, anyway.


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.471.2.23
retrieving revision 1.471.2.24
diff -u -d -p -r1.471.2.23 -r1.471.2.24
--- gtkconv.c	24 May 2005 04:37:32 -0000	1.471.2.23
+++ gtkconv.c	2 Jun 2005 01:29:20 -0000	1.471.2.24
@@ -5140,6 +5140,22 @@ gaim_gtkconv_write_conv(GaimConversation
 		gaim_conv_window_show(win);
 	}
 
+	/*
+	 * If we received an IM, and the GaimConvWindow is not active,
+	 * 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
+	 * especially important when the IM window is flashing in their
+	 * taskbar--we want the title of the window to be set to the name
+	 * of the person that IMed them most recently.
+	 */
+	if ((gaim_conversation_get_type(conv) == GAIM_CONV_IM) &&
+		(!gaim_conv_window_has_focus(win)))
+	{
+		gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv));
+	}
+
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0);