Patch 7.4a.024
Problem: X11 GUI: Checking icon height twice.
Solution: Check height and width. (Dominique Pelle)
Files: src/gui_x11.c
*** ../vim-7.4a.023/src/gui_x11.c 2013-06-30 17:39:30.000000000 +0200
--- src/gui_x11.c 2013-07-14 15:01:56.000000000 +0200
***************
*** 1503,1516 ****
if (XGetIconSizes(XtDisplay(vimShell), root_window,
&size, &number_sizes) != 0)
{
-
if (number_sizes > 0)
{
! if (size->max_height >= 48 && size->max_height >= 48)
magick = vim48x48;
! else if (size->max_height >= 32 && size->max_height >= 32)
magick = vim32x32;
! else if (size->max_height >= 16 && size->max_height >= 16)
magick = vim16x16;
}
}
--- 1503,1515 ----
if (XGetIconSizes(XtDisplay(vimShell), root_window,
&size, &number_sizes) != 0)
{
if (number_sizes > 0)
{
! if (size->max_height >= 48 && size->max_width >= 48)
magick = vim48x48;
! else if (size->max_height >= 32 && size->max_width >= 32)
magick = vim32x32;
! else if (size->max_height >= 16 && size->max_width >= 16)
magick = vim16x16;
}
}
*** ../vim-7.4a.023/src/version.c 2013-07-14 13:41:50.000000000 +0200
--- src/version.c 2013-07-14 14:52:41.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
{ /* Add new patch number below this line */
+ /**/
+ 24,
/**/
--
"Beware of bugs in the above code; I have only proved
it correct, not tried it." -- Donald Knuth
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
