# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1453222806 -3600
# Node ID c80284cfe1b8dc3209439bb87cf027f2e6aa1544
# Parent  186ca15645b1cd92a07f4904ef700207f6a65315
commit https://github.com/vim/vim/commit/3a466a87180d677b898687ef72d09f14a397794e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jan 19 17:47:25 2016 +0100

    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)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
--- 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
--- 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,