diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-14 15:06:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-14 15:06:50 +0200 |
| commit | 6f2926692b12b2b06ae97336462058808bfdc6c0 (patch) | |
| tree | 4747f1fd02b9c2a037be0c1559c880055245619c | |
| parent | 6f394f88b8de6aa94d0b4bea47f1532f3cc06b3f (diff) | |
| download | vim-git-6f2926692b12b2b06ae97336462058808bfdc6c0.tar.gz | |
updated for version 7.4a.024v7.4a.024
Problem: X11 GUI: Checking icon height twice.
Solution: Check height and width. (Dominique Pelle)
| -rw-r--r-- | src/gui_x11.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c index f09d1a0c3..ed71b26ce 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 59e67432c..d8c9cc271 100644 --- 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, |