Mercurial > pidgin
changeset 5462:8355eeeb52a3
[gaim-migrate @ 5853]
Switching tabs no longer re-shows a buddy icon when hidden, or re-animates
when animation is turned off.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 20 May 2003 19:20:35 +0000 |
| parents | 7883082c290a |
| children | b6ef2b1cb70b |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Tue May 20 18:15:25 2003 +0000 +++ b/src/gtkconv.c Tue May 20 19:20:35 2003 +0000 @@ -1780,7 +1780,7 @@ gtk_widget_grab_focus(gtkconv->entry); gtk_window_set_title(GTK_WINDOW(gtkwin->window), - gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); + gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); } /************************************************************************** @@ -4746,6 +4746,7 @@ char filename[256]; FILE *file; GError *err = NULL; + gboolean animate = TRUE; struct buddy *buddy; @@ -4769,6 +4770,9 @@ gtkconv = GAIM_GTK_CONVERSATION(conv); + if (gtkconv->u.im->icon_timer == 0 && gtkconv->u.im->icon != NULL) + animate = FALSE; + remove_icon(gtkconv); if (im_options & OPT_IM_HIDE_ICONS) @@ -4870,7 +4874,7 @@ gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon); gtk_widget_show(gtkconv->u.im->icon); - if(im_options & OPT_IM_NO_ANIMATION) + if ((im_options & OPT_IM_NO_ANIMATION) || animate == FALSE) stop_anim(NULL, conv); g_object_unref(G_OBJECT(pm));