# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1132502541 0
# Node ID ffdd2ccf3a53a84aa0e1577816a492ea0dbca9e5
# Parent  51c194ca6016530046207ea2a27c60fc9987d1ab
[gaim-migrate @ 14473]
Only set the gtk window's icon when updating a conversation's icon if the
conversation is the currently active conversation in the window.

committer: Tailor Script <tailor@pidgin.im>

diff -r 51c194ca6016 -r ffdd2ccf3a53 src/gtkconv.c
--- a/src/gtkconv.c	Sun Nov 20 13:17:04 2005 +0000
+++ b/src/gtkconv.c	Sun Nov 20 16:02:21 2005 +0000
@@ -5005,18 +5005,21 @@
 	/*
 	 * Update the window's icon
 	 */
-	if ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
-		(gtkconv->u.im->anim))
+	if (gaim_gtk_conv_window_is_active_conversation(conv))
 	{
-		window_icon =
-			gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
-		g_object_ref(window_icon);
-	} else {
-		window_icon = gaim_gtkconv_get_tab_icon(conv, FALSE);
-	}
-	gtk_window_set_icon(GTK_WINDOW(win->window), window_icon);
-	if (window_icon != NULL)
-		g_object_unref(G_OBJECT(window_icon));
+		if ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
+				(gtkconv->u.im->anim))
+		{
+			window_icon =
+				gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
+			g_object_ref(window_icon);
+		} else {
+			window_icon = gaim_gtkconv_get_tab_icon(conv, FALSE);
+		}
+		gtk_window_set_icon(GTK_WINDOW(win->window), window_icon);
+		if (window_icon != NULL)
+			g_object_unref(G_OBJECT(window_icon));
+	}
 }