From 6f2926692b12b2b06ae97336462058808bfdc6c0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 14 Jul 2013 15:06:50 +0200 Subject: updated for version 7.4a.024 Problem: X11 GUI: Checking icon height twice. Solution: Check height and width. (Dominique Pelle) --- src/gui_x11.c | 7 +++---- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui_x11.c b/src/gui_x11.c index f09d1a0c36..ed71b26ce8 100644 --- 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 index 59e67432cb..d8c9cc271d 100644 --- a/src/version.c +++ b/src/version.c @@ -727,6 +727,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 24, /**/ 23, /**/ -- cgit v1.2.3