mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 7.4.1138
Problem: When running gvim in the foreground some icons are missing. (Taylor Venable) Solution: Move the call to gui_gtk_register_resource(). (Kazunobu Kuriyama)
This commit is contained in:
parent
62ef797496
commit
3a466a8718
@ -1437,9 +1437,6 @@ gui_mch_early_init_check(void)
|
||||
EMSG(_((char *)e_opendisp));
|
||||
return FAIL;
|
||||
}
|
||||
#ifdef USE_GRESOURCE
|
||||
gui_gtk_register_resource();
|
||||
#endif
|
||||
return OK;
|
||||
}
|
||||
|
||||
@ -1451,6 +1448,18 @@ gui_mch_early_init_check(void)
|
||||
int
|
||||
gui_mch_init_check(void)
|
||||
{
|
||||
#ifdef USE_GRESOURCE
|
||||
static int res_registered = FALSE;
|
||||
|
||||
if (!res_registered)
|
||||
{
|
||||
/* Call this function in the GUI process; otherwise, the resources
|
||||
* won't be available. Don't call it twice. */
|
||||
res_registered = TRUE;
|
||||
gui_gtk_register_resource();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_GUI_GNOME
|
||||
if (gtk_socket_id == 0)
|
||||
using_gnome = 1;
|
||||
|
@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1138,
|
||||
/**/
|
||||
1137,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user