Mercurial > pidgin
changeset 12171:ffdd2ccf3a53
[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>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 20 Nov 2005 16:02:21 +0000 |
| parents | 51c194ca6016 |
| children | d5937f126c60 |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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)); + } }