# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1373807210 -7200
# Node ID ba9a11fe25637103e1a77fefbbaed4ac2ff182f9
# Parent  aed1105b7cfdbf6623b4f4f8cf6cef1fe5ca6dde
updated for version 7.4a.024
Problem:    X11 GUI: Checking icon height twice.
Solution:   Check height and width. (Dominique Pelle)

diff --git a/src/gui_x11.c b/src/gui_x11.c
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1503,14 +1503,13 @@ gui_mch_init()
     if (XGetIconSizes(XtDisplay(vimShell), root_window,
 						   &size, &number_sizes) != 0)
     {
-
 	if (number_sizes > 0)
 	{
-	    if (size->max_height >= 48 && size->max_height >= 48)
+	    if (size->max_height >= 48 && size->max_width >= 48)
 		magick = vim48x48;
-	    else if (size->max_height >= 32 && size->max_height >= 32)
+	    else if (size->max_height >= 32 && size->max_width >= 32)
 		magick = vim32x32;
-	    else if (size->max_height >= 16 && size->max_height >= 16)
+	    else if (size->max_height >= 16 && size->max_width >= 16)
 		magick = vim16x16;
 	}
     }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    24,
+/**/
     23,
 /**/
     22,