2007-01-04 [wwp] 2.6.1cvs104

	* src/image_viewer.c
		Force operator precedence (fix a compiler warning).

diff --git a/ChangeLog b/ChangeLog
index 2f8ffd709031e8f6eefe68900d77a9e5c9d81d42..463248313263323a1c8b495b18efca9418e35429 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-04 [wwp]       2.6.1cvs104
+
+       * src/image_viewer.c
+               Force operator precedence (fix a compiler warning).
+
 2007-01-04 [colin]     2.6.1cvs103
 
        * src/image_viewer.c

diff --git a/PATCHSETS b/PATCHSETS
index 7c60073dcfbdd71f5034c28c5a20077f3962ef8d..eb0f9f85a2f53229d793c485586e49a6f1ca952c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2211,3 +2211,4 @@
 ( 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
+( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/image_viewer.c;  ) > 2.6.1cvs104.patchset

diff --git a/configure.ac b/configure.ac
index af2cc6646f0f33ca3524b1571ce295eb129931b4..ac74f731b37a25e54b1dd4158c83482eb0818bd4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/image_viewer.c b/src/image_viewer.c
index 1223536c91f09cfaca3a5577f02b328628e03697..f481874472dd4163481bb235aad246423dad998b 100644 (file)
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -85,7 +85,7 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
                if (avail_width > 8) avail_width -= 8;
                if (avail_height > 8) avail_height -= 8;
                if (avail_width - 100 > 0 &&
-                   w > avail_width || h > avail_height)
+                   (w > avail_width || h > avail_height))
                        pixbuf = gdk_pixbuf_new_from_file_at_scale(imgfile, avail_width,
                                avail_height, TRUE, &error);
                else