# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1085949254 0
# Node ID 4ae7639601405bea35a0554594c1304ce48962e0
# Parent  933a19e3a6b38d4c60e60f1439aa7e43113cbf1d
[gaim-migrate @ 9912]
Thanks to tszcheetah's bug 961232 I fixed the icon freezing problem.

committer: Tailor Script <tailor@pidgin.im>

diff -r 933a19e3a6b3 -r 4ae763960140 ChangeLog
--- a/ChangeLog	Sun May 30 19:34:21 2004 +0000
+++ b/ChangeLog	Sun May 30 20:34:14 2004 +0000
@@ -1,5 +1,9 @@
 Gaim: The Pimpin' Penguin IM Client that's good for the soul!
 
+version 0.79cvs:
+	Bug Fixes:
+	* Non-looping animated icons no longer cause Gaim to freeze
+
 version 0.78 (05/30/2004):
 	New Features:
 	* Support for the SILC protocol (http://www.silcnet.org/)
diff -r 933a19e3a6b3 -r 4ae763960140 src/gtkconv.c
--- a/src/gtkconv.c	Sun May 30 19:34:21 2004 +0000
+++ b/src/gtkconv.c	Sun May 30 20:34:14 2004 +0000
@@ -2199,9 +2199,11 @@
 	if (bm)
 		g_object_unref(G_OBJECT(bm));
 
-	delay = gdk_pixbuf_animation_iter_get_delay_time(gtkconv->u.im->iter) / 10;
-
-	gtkconv->u.im->icon_timer = g_timeout_add(delay * 10, redraw_icon, conv);
+	delay = gdk_pixbuf_animation_iter_get_delay_time(gtkconv->u.im->iter);
+	if (delay <= 0)
+		delay = 100;
+
+	gtkconv->u.im->icon_timer = g_timeout_add(delay, redraw_icon, conv);
 
 	return FALSE;
 }