changeset 9131:4ae763960140

[gaim-migrate @ 9912] Thanks to tszcheetah's bug 961232 I fixed the icon freezing problem. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 30 May 2004 20:34:14 +0000
parents 933a19e3a6b3
children 9c1358090c6f
files ChangeLog src/gtkconv.c
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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/)
--- 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;
 }