Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv30776/src
Modified Files:
conversation.c
Log Message:
Bugfix to "Disable buddy icon animation by Luke Schierer
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -d -r1.345 -r1.346
--- conversation.c 19 Mar 2002 06:29:30 -0000 1.345
+++ conversation.c 28 Mar 2002 17:44:48 -0000 1.346
@@ -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);
|
