diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 2 | ||||
| -rw-r--r-- | mail/em-icon-stream.c | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5f853b17c4..bffcc46327 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-01-11 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #488213 + + * em-icon-stream.c: (emis_fit): + * em-format-html-display.c: (efhd_attachment_button): + Use global function e_icon_factory_pixbuf_scale for scaling pixbufs. + 2008-01-10 Milan Crha <mcrha@redhat.com> ** Fix for bug #507067 diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 6da3096774..6e0b0e759d 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -1937,7 +1937,7 @@ efhd_attachment_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje GdkPixbuf *pixbuf, *mini; if ((pixbuf = e_icon_for_mime_type (simple_type, 24))) { - if ((mini = gdk_pixbuf_scale_simple (pixbuf, 24, 24, GDK_INTERP_BILINEAR))) { + if ((mini = e_icon_factory_pixbuf_scale (pixbuf, 24, 24))) { gtk_image_set_from_pixbuf ((GtkImage *) w, mini); g_object_unref (mini); } diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index ebd2cf6cc1..9f698e2c54 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -30,11 +30,9 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h> -#ifdef HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H -#include <libgnomeui/gnome-thumbnail.h> -#endif #include <gtk/gtkimage.h> #include "em-icon-stream.h" +#include "e-util/e-icon-factory.h" #include "libedataserver/e-msgport.h" @@ -187,11 +185,7 @@ emis_fit(GdkPixbuf *pixbuf, int maxwidth, int maxheight, int *scale) if (height <= 0) height = 1; -#ifdef HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H - mini = gnome_thumbnail_scale_down_pixbuf(pixbuf, width, height); -#else - mini = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR); -#endif + mini = e_icon_factory_pixbuf_scale (pixbuf, width, height); } return mini; |