[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-294-gd00635536

paul at claws-mail.org paul at claws-mail.org
Mon Oct 4 10:37:48 CEST 2021


The branch, gtk3 has been updated
       via  d006355369916eefff3d964d4606e183339418aa (commit)
      from  0371d85eea01def93d51c6a5f13f0f668cef2391 (commit)

Summary of changes:
 src/image_viewer.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit d006355369916eefff3d964d4606e183339418aa
Author: paul <paul at claws-mail.org>
Date:   Mon Oct 4 09:37:45 2021 +0100

    fix 'suggest parentheses' warning

diff --git a/src/image_viewer.c b/src/image_viewer.c
index 087c96f63..20672791d 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -106,8 +106,8 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
 	}
 
 #if GDK_PIXBUF_MINOR >= 28
-	if (animation && gdk_pixbuf_animation_is_static_image(animation)
-	    || imageviewer->resize_img || imageviewer->fit_img_height) {
+	if ((animation && gdk_pixbuf_animation_is_static_image(animation)) ||
+	    imageviewer->resize_img || imageviewer->fit_img_height) {
 		pixbuf = gdk_pixbuf_animation_get_static_image(animation);
 		g_object_ref(pixbuf);
 		g_object_unref(animation);
@@ -118,12 +118,13 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
 		if (imageviewer->resize_img) {
 			gtk_widget_get_allocation(imageviewer->scrolledwin, &allocation);
 			pixbuf = claws_load_pixbuf_fitting(pixbuf, FALSE,
-				imageviewer->fit_img_height,
-				allocation.width,
-				allocation.height);
-		}
-		else
-			pixbuf = claws_load_pixbuf_fitting(pixbuf, FALSE, imageviewer->fit_img_height, -1, -1);
+							   imageviewer->fit_img_height,
+				      			   allocation.width,
+				      			   allocation.height);
+		} else
+			pixbuf = claws_load_pixbuf_fitting(pixbuf, FALSE,
+							   imageviewer->fit_img_height,
+							   -1, -1);
 	}
 
 	if (!pixbuf && !animation) {

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list