use the cache, since we set it up. (efhd_image): added a (private!) format

2005-07-05  Not Zed  <NotZed@Ximian.com>

        * em-format-html-display.c (efhd_attachment_image): use the cache,
        since we set it up.
        (efhd_image): added a (private!) format handler for all the image
        types so we intercept them and handle them directly.
        (efhd_image_fit, efhd_image_unfit): replace the resize callback
        with two much simpler ones.

        * em-icon-stream.c (em_icon_stream_get_image): added 'fit to'
        arguments.  Changed dramatically to get approximate fit-to image,
        update cache, etc.
        (em_icon_stream_is_resized): added 'fit to' arguments.  changed to
        manipulate the cache properly.
        (emis_fit): helper to fit an image to a size.
        (em_icon_stream_new): added 'fit to' arguments rather than poking
        structures.

        * em-format-html-display.c (efhd_attachment_image): fixed a memory
        leak, various style issues.  Removed all scaling code.
        (efhd_attachment_popup): show menu's appropriately.  add back the
        hide/show menu always.
        (efhd_image_popup): fix formatting.

        ** Applied patch from Srini for scaling images to fit by default.

svn path=/trunk/; revision=29640

1 files changed, 6 insertions, 2 deletions

diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h
index 124259b3df..4b048f3428 100644
--- a/mail/em-icon-stream.h
+++ b/mail/em-icon-stream.h
@@ -46,6 +46,8 @@ typedef struct _EMIconStream {
 	struct _GdkPixbufLoader *loader;
 	struct _GtkImage *image;
 	char *key;
+
+	int keep:1;
 } EMIconStream;
 
 typedef struct {
@@ -53,9 +55,11 @@ typedef struct {
 } EMIconStreamClass;
 
 CamelType    em_icon_stream_get_type (void);
+CamelStream *em_icon_stream_new(GtkImage *image, const char *key, unsigned int maxwidth, unsigned int maxheight, int keep);
+
+struct _GdkPixbuf *em_icon_stream_get_image(const char *key, unsigned int maxwidth, unsigned int maxheight);
+int em_icon_stream_is_resized(const char *key, unsigned int maxwidth, unsigned int maxheight);
 
-CamelStream *em_icon_stream_new(GtkImage *image, const char *key);
-struct _GdkPixbuf *em_icon_stream_get_image(const char *key);
 void em_icon_stream_clear_cache(void);
 
 #ifdef __cplusplus