Mercurial > pidgin
comparison src/oscar.c @ 1985:008a4cc4a82c
[gaim-migrate @ 1995]
hi.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 11 Jun 2001 09:21:18 +0000 |
| parents | 26ff22691f5e |
| children | 591ebfe8ec00 |
comparison
equal
deleted
inserted
replaced
| 1984:e90a0164436c | 1985:008a4cc4a82c |
|---|---|
| 1708 if (bm) | 1708 if (bm) |
| 1709 gdk_bitmap_unref(bm); | 1709 gdk_bitmap_unref(bm); |
| 1710 break; | 1710 break; |
| 1711 } | 1711 } |
| 1712 ir->curframe = (ir->curframe + 1) % g_list_length(frames); | 1712 ir->curframe = (ir->curframe + 1) % g_list_length(frames); |
| 1713 delay = gdk_pixbuf_frame_get_delay_time(frame); | 1713 delay = MAX(gdk_pixbuf_frame_get_delay_time(frame), 13); |
| 1714 ir->timer = gtk_timeout_add(delay * 10, redraw_anim, ir); | 1714 ir->timer = gtk_timeout_add(delay * 10, redraw_anim, ir); |
| 1715 return FALSE; | 1715 return FALSE; |
| 1716 } | 1716 } |
| 1717 #endif | 1717 #endif |
| 1718 | 1718 |
| 1856 frames = gdk_pixbuf_animation_get_frames(ir->anim); | 1856 frames = gdk_pixbuf_animation_get_frames(ir->anim); |
| 1857 buf = gdk_pixbuf_frame_get_pixbuf(frames->data); | 1857 buf = gdk_pixbuf_frame_get_pixbuf(frames->data); |
| 1858 gdk_pixbuf_render_pixmap_and_mask(buf, &pm, &bm, 0); | 1858 gdk_pixbuf_render_pixmap_and_mask(buf, &pm, &bm, 0); |
| 1859 | 1859 |
| 1860 if (gdk_pixbuf_animation_get_num_frames(ir->anim) > 1) { | 1860 if (gdk_pixbuf_animation_get_num_frames(ir->anim) > 1) { |
| 1861 int delay = gdk_pixbuf_frame_get_delay_time(frames->data); | 1861 int delay = |
| 1862 MAX(gdk_pixbuf_frame_get_delay_time(frames->data), 13); | |
| 1862 ir->curframe = 1; | 1863 ir->curframe = 1; |
| 1863 ir->timer = gtk_timeout_add(delay * 10, redraw_anim, ir); | 1864 ir->timer = gtk_timeout_add(delay * 10, redraw_anim, ir); |
| 1864 } | 1865 } |
| 1865 } else { | 1866 } else { |
| 1866 ir->unanim = gdk_pixbuf_loader_get_pixbuf(load); | 1867 ir->unanim = gdk_pixbuf_loader_get_pixbuf(load); |
| 3263 frames = gdk_pixbuf_animation_get_frames(ir->anim); | 3264 frames = gdk_pixbuf_animation_get_frames(ir->anim); |
| 3264 buf = gdk_pixbuf_frame_get_pixbuf(frames->data); | 3265 buf = gdk_pixbuf_frame_get_pixbuf(frames->data); |
| 3265 gdk_pixbuf_render_pixmap_and_mask(buf, &pm, &bm, 0); | 3266 gdk_pixbuf_render_pixmap_and_mask(buf, &pm, &bm, 0); |
| 3266 | 3267 |
| 3267 if (gdk_pixbuf_animation_get_num_frames(ir->anim) > 1) { | 3268 if (gdk_pixbuf_animation_get_num_frames(ir->anim) > 1) { |
| 3268 int delay = gdk_pixbuf_frame_get_delay_time(frames->data); | 3269 int delay = MAX(gdk_pixbuf_frame_get_delay_time(frames->data), 13); |
| 3269 ir->curframe = 1; | 3270 ir->curframe = 1; |
| 3270 ir->timer = gtk_timeout_add(delay * 10, redraw_anim, ir); | 3271 ir->timer = gtk_timeout_add(delay * 10, redraw_anim, ir); |
| 3271 } | 3272 } |
| 3272 } else { | 3273 } else { |
| 3273 ir->unanim = gdk_pixbuf_loader_get_pixbuf(load); | 3274 ir->unanim = gdk_pixbuf_loader_get_pixbuf(load); |