# HG changeset patch # User Eric Warmenhoven # Date 997399449 0 # Node ID 1fc962350561b555f6f057bbc48a75c742ab0dbd # Parent 66a84ff0445a59baf297d778f43243c36a37fe73 [gaim-migrate @ 2151] because one time, at band camp, there was this guy, and no matter what he did, there was always something wrong with it, and other people had to keep correcting him, and at first it was really annoying but then it became really funny committer: Tailor Script diff -r 66a84ff0445a -r 1fc962350561 src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Thu Aug 09 16:53:19 2001 +0000 +++ b/src/protocols/oscar/oscar.c Thu Aug 09 23:24:09 2001 +0000 @@ -1615,20 +1615,20 @@ case GDK_PIXBUF_FRAME_RETAIN: buf = gdk_pixbuf_frame_get_pixbuf(frame); scale = gdk_pixbuf_scale_simple(buf, - gdk_pixbuf_get_width(buf) * SCALE / - gdk_pixbuf_animation_get_width(ir->anim), - gdk_pixbuf_get_height(buf) * SCALE / - gdk_pixbuf_animation_get_height(ir->anim), + MAX(gdk_pixbuf_get_width(buf) * SCALE / + gdk_pixbuf_animation_get_width(ir->anim), 1), + MAX(gdk_pixbuf_get_height(buf) * SCALE / + gdk_pixbuf_animation_get_height(ir->anim), 1), GDK_INTERP_NEAREST); gdk_pixbuf_render_pixmap_and_mask(scale, &src, NULL, 0); gdk_pixbuf_unref(scale); gtk_pixmap_get(GTK_PIXMAP(ir->pix), &pm, &bm); gc = gdk_gc_new(pm); gdk_draw_pixmap(pm, gc, src, 0, 0, - gdk_pixbuf_frame_get_x_offset(frame) * SCALE / - gdk_pixbuf_animation_get_width(ir->anim), - gdk_pixbuf_frame_get_y_offset(frame) * SCALE / - gdk_pixbuf_animation_get_height(ir->anim), + MAX(gdk_pixbuf_frame_get_x_offset(frame) * SCALE / + gdk_pixbuf_animation_get_width(ir->anim), 1), + MAX(gdk_pixbuf_frame_get_y_offset(frame) * SCALE / + gdk_pixbuf_animation_get_height(ir->anim), 1), -1, -1); gdk_pixmap_unref(src); gtk_widget_queue_draw(ir->pix); @@ -1637,10 +1637,10 @@ case GDK_PIXBUF_FRAME_DISPOSE: buf = gdk_pixbuf_frame_get_pixbuf(frame); scale = gdk_pixbuf_scale_simple(buf, - gdk_pixbuf_get_width(buf) * SCALE / - gdk_pixbuf_animation_get_width(ir->anim), - gdk_pixbuf_get_height(buf) * SCALE / - gdk_pixbuf_animation_get_height(ir->anim), + MAX(gdk_pixbuf_get_width(buf) * SCALE / + gdk_pixbuf_animation_get_width(ir->anim), 1), + MAX(gdk_pixbuf_get_height(buf) * SCALE / + gdk_pixbuf_animation_get_height(ir->anim), 1), GDK_INTERP_NEAREST); gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0); gdk_pixbuf_unref(scale); @@ -1653,10 +1653,10 @@ frame = frames->data; buf = gdk_pixbuf_frame_get_pixbuf(frame); scale = gdk_pixbuf_scale_simple(buf, - gdk_pixbuf_get_width(buf) * SCALE / - gdk_pixbuf_animation_get_width(ir->anim), - gdk_pixbuf_get_height(buf) * SCALE / - gdk_pixbuf_animation_get_height(ir->anim), + MAX(gdk_pixbuf_get_width(buf) * SCALE / + gdk_pixbuf_animation_get_width(ir->anim), 1), + MAX(gdk_pixbuf_get_height(buf) * SCALE / + gdk_pixbuf_animation_get_height(ir->anim), 1), GDK_INTERP_NEAREST); gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0); gdk_pixbuf_unref(scale); @@ -1840,10 +1840,10 @@ frames = gdk_pixbuf_animation_get_frames(ir->anim); buf = gdk_pixbuf_frame_get_pixbuf(frames->data); scale = gdk_pixbuf_scale_simple(buf, - gdk_pixbuf_get_width(buf) * SCALE / - gdk_pixbuf_animation_get_width(ir->anim), - gdk_pixbuf_get_height(buf) * SCALE / - gdk_pixbuf_animation_get_height(ir->anim), + MAX(gdk_pixbuf_get_width(buf) * SCALE / + gdk_pixbuf_animation_get_width(ir->anim), 1), + MAX(gdk_pixbuf_get_height(buf) * SCALE / + gdk_pixbuf_animation_get_height(ir->anim), 1), GDK_INTERP_NEAREST); gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0); gdk_pixbuf_unref(scale); @@ -3210,10 +3210,10 @@ frames = gdk_pixbuf_animation_get_frames(ir->anim); buf = gdk_pixbuf_frame_get_pixbuf(frames->data); scale = gdk_pixbuf_scale_simple(buf, - gdk_pixbuf_get_width(buf) * SCALE / - gdk_pixbuf_animation_get_width(ir->anim), - gdk_pixbuf_get_height(buf) * SCALE / - gdk_pixbuf_animation_get_height(ir->anim), + MAX(gdk_pixbuf_get_width(buf) * SCALE / + gdk_pixbuf_animation_get_width(ir->anim), 1), + MAX(gdk_pixbuf_get_height(buf) * SCALE / + gdk_pixbuf_animation_get_height(ir->anim), 1), GDK_INTERP_NEAREST); gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0); gdk_pixbuf_unref(scale);