Mercurial > pidgin
comparison gtk/gtkconv.c @ 15237:658f815e2b58
[gaim-migrate @ 18027]
This fixes a bug I was hitting, that datallah mentioned was assigned to him (1618871).
Datallah, feel free to close that bug..
committer: Tailor Script <tailor@pidgin.im>
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Wed, 20 Dec 2006 05:50:49 +0000 |
| parents | 9a44dd7955d6 |
| children | 30932055bb7c |
comparison
equal
deleted
inserted
replaced
| 15236:2bcb8684bfb5 | 15237:658f815e2b58 |
|---|---|
| 6068 buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter); | 6068 buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter); |
| 6069 if (gtkconv->u.im->animate) | 6069 if (gtkconv->u.im->animate) |
| 6070 start_anim(NULL, gtkconv); | 6070 start_anim(NULL, gtkconv); |
| 6071 } | 6071 } |
| 6072 | 6072 |
| 6073 if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) | 6073 if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) { |
| 6074 gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, | 6074 gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, |
| 6075 &scale_width, &scale_height); | 6075 &scale_width, &scale_height); |
| 6076 } else { | |
| 6077 scale_width = gdk_pixbuf_get_width(buf); | |
| 6078 scale_height = gdk_pixbuf_get_height(buf); | |
| 6079 } | |
| 6080 | |
| 6076 scale = gdk_pixbuf_scale_simple(buf, | 6081 scale = gdk_pixbuf_scale_simple(buf, |
| 6077 MAX(gdk_pixbuf_get_width(buf) * scale_width / | 6082 MAX(gdk_pixbuf_get_width(buf) * scale_width / |
| 6078 gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1), | 6083 gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1), |
| 6079 MAX(gdk_pixbuf_get_height(buf) * scale_height / | 6084 MAX(gdk_pixbuf_get_height(buf) * scale_height / |
| 6080 gdk_pixbuf_animation_get_height(gtkconv->u.im->anim), 1), | 6085 gdk_pixbuf_animation_get_height(gtkconv->u.im->anim), 1), |