2007-01-04 [colin] 2.6.1cvs103
authorColin Leroy <colin@colino.net>
Thu, 4 Jan 2007 07:34:05 +0000 (07:34 +0000)
committerColin Leroy <colin@colino.net>
Thu, 4 Jan 2007 07:34:05 +0000 (07:34 +0000)
* src/image_viewer.c
Be cautious there too (same fix as the one
in textview from cvs33)
* src/messageview.c
Don't use any MimeViewer plugin when showing
all headers

ChangeLog
PATCHSETS
configure.ac
src/image_viewer.c
src/messageview.c

index caa3c58d5801e97f68dba3015aad8f7029665abf..2f8ffd709031e8f6eefe68900d77a9e5c9d81d42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-04 [colin]     2.6.1cvs103
+
+       * src/image_viewer.c
+               Be cautious there too (same fix as the one
+               in textview from cvs33)
+       * src/messageview.c
+               Don't use any MimeViewer plugin when showing
+               all headers
+
 2007-01-03 [wwp]       2.6.1cvs102
 
        * src/html.c
index 0671f425deb6cc25a5965fe73efcd72a242d8c96..7c60073dcfbdd71f5034c28c5a20077f3962ef8d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/html.c;  ) > 2.6.1cvs100.patchset
 ( cvs diff -u -r 1.382.2.348 -r 1.382.2.349 src/compose.c;  cvs diff -u -r 1.94.2.113 -r 1.94.2.114 src/messageview.c;  cvs diff -u -r 1.150.2.86 -r 1.150.2.87 src/procmsg.c;  cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/procmsg.h;  ) > 2.6.1cvs101.patchset
 ( cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/html.c;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/html.h;  ) > 2.6.1cvs102.patchset
+( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/image_viewer.c;  cvs diff -u -r 1.94.2.114 -r 1.94.2.115 src/messageview.c;  ) > 2.6.1cvs103.patchset
index b7d7abaf250d1acafd5e3be5a955c5ee1eedbfa4..af2cc6646f0f33ca3524b1571ce295eb129931b4 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=102
+EXTRA_VERSION=103
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 555bed4efc9bc95bc2ee9b74a47e9dc7e5d43e65..1223536c91f09cfaca3a5577f02b328628e03697 100644 (file)
@@ -84,7 +84,8 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
                avail_height = imageviewer->notebook->parent->allocation.height;
                if (avail_width > 8) avail_width -= 8;
                if (avail_height > 8) avail_height -= 8;
-               if (w > avail_width || h > avail_height)
+               if (avail_width - 100 > 0 &&
+                   w > avail_width || h > avail_height)
                        pixbuf = gdk_pixbuf_new_from_file_at_scale(imgfile, avail_width,
                                avail_height, TRUE, &error);
                else
index a55f5d4854617ad37e4bacc8f3a86e9d71428098..0da8d7e7649bf009011c29f6914486df0df63c8c 100644 (file)
@@ -887,7 +887,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                noticeview_hide(messageview->noticeview);
 
        mimeinfo = procmime_mimeinfo_next(mimeinfo);
-       if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
+       if (!all_headers && mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
            strcasecmp(mimeinfo->subtype, "plain"))) {
                if (strcasecmp(mimeinfo->subtype, "html"))
                        mimeview_show_part(messageview->mimeview,mimeinfo);