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
index f09d1a0..ed71b26 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1503,14 +1503,13 @@
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
index 59e6743..d8c9cc2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 24,
+/**/
23,
/**/
22,
