# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1109442472 0
# Node ID 84fb7beabb5c84ca12ee028aa8a44b36660e6ca2
# Parent  222b53ee74f3f67f5aeb4eedea34508bcc93b710
[gaim-migrate @ 12142]
sf patch #1152367, from Nathan Conrad
Limit framerate of buddy icons

committer: Tailor Script <tailor@pidgin.im>

diff -r 222b53ee74f3 -r 84fb7beabb5c COPYRIGHT
--- a/COPYRIGHT	Fri Feb 25 16:17:04 2005 +0000
+++ b/COPYRIGHT	Sat Feb 26 18:27:52 2005 +0000
@@ -34,6 +34,7 @@
 Vincas Ciziunas
 Joe Clarke
 Todd Cohen
+Nathan Conrad
 Felipe Contreras
 Alex Converse
 Irving Cordova
diff -r 222b53ee74f3 -r 84fb7beabb5c ChangeLog
--- a/ChangeLog	Fri Feb 25 16:17:04 2005 +0000
+++ b/ChangeLog	Sat Feb 26 18:27:52 2005 +0000
@@ -34,6 +34,9 @@
 	  with the same name (Andrew Hart)
 	* Improved buddy list searching with CTRL+F
 	* Correctly show the time when incoming Gadu-Gadu messages were sent
+	* Limit animated buddy icon frame rates to 10 frames per second
+	  (Nathan Conrad)
+
 
 	Preference changes:
 	* Removed "Dim idle buddies" buddy list preference, default to "Yes."
diff -r 222b53ee74f3 -r 84fb7beabb5c src/gtkconv.c
--- a/src/gtkconv.c	Fri Feb 25 16:17:04 2005 +0000
+++ b/src/gtkconv.c	Sat Feb 26 18:27:52 2005 +0000
@@ -2410,7 +2410,8 @@
 		g_object_unref(G_OBJECT(bm));
 
 	delay = gdk_pixbuf_animation_iter_get_delay_time(gtkconv->u.im->iter);
-	if (delay <= 0)
+
+	if (delay < 100)
 		delay = 100;
 
 	gtkconv->u.im->icon_timer = g_timeout_add(delay, redraw_icon, conv);
@@ -2438,9 +2439,12 @@
 	if (gdk_pixbuf_animation_is_static_image(gtkconv->u.im->anim))
 		return;
 
-	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 < 100)
+		delay = 100;
+
+    gtkconv->u.im->icon_timer = g_timeout_add(delay, redraw_icon, conv);
 }
 
 static void