# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1017337488 0
# Node ID 58588d33a3ca9a49c0ed3290e03dd549b251aefb
# Parent  86696ebd0022fa61bd89ad1893f0655893c55092
[gaim-migrate @ 3111]
Bugfix to "Disable buddy icon animation by Luke Schierer

committer: Tailor Script <tailor@pidgin.im>

diff -r 86696ebd0022 -r 58588d33a3ca src/conversation.c
--- a/src/conversation.c	Tue Mar 26 01:56:06 2002 +0000
+++ b/src/conversation.c	Thu Mar 28 17:44:48 2002 +0000
@@ -3267,7 +3267,8 @@
 	frames = gdk_pixbuf_animation_get_frames(c->anim);
 	frame = g_list_nth_data(frames, c->frame);
 	delay = MAX(gdk_pixbuf_frame_get_delay_time(frame), 13);
-	c->icon_timer = gtk_timeout_add(delay * 10, redraw_icon, c);
+	if (c->anim)
+	    c->icon_timer = gtk_timeout_add(delay * 10, redraw_icon, c);
 }
 
 static int des_save_icon(GtkObject *obj, GdkEvent *e, struct conversation *c)
@@ -3522,6 +3523,8 @@
 {
 #if USE_PIXBUF
 	GList *c = conversations;
+	if (im_options & OPT_IM_HIDE_ICONS)
+		return;
 	while (c) {
 		if(im_options & OPT_IM_NO_ANIMATION)
 			stop_anim(NULL, c->data);