diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-19 17:47:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-19 17:47:25 +0100 |
| commit | 3a466a87180d677b898687ef72d09f14a397794e (patch) | |
| tree | c768f9b7b0aaae92465fbedd73ecdc4b3126668a /src | |
| parent | 62ef797496c6243d111c596a592a8ef8c1d1e710 (diff) | |
| download | vim-3a466a87180d677b898687ef72d09f14a397794e.zip | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_gtk_x11.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 9967795e0..8a718ac5d 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -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; diff --git a/src/version.c b/src/version.c index 845158b1f..d42a23777 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1138, +/**/ 1137, /**/ 1136, |