Mercurial > vim

comparison src/gui_gtk_x11.c @ 7679:c80284cfe1b8 v7.4.1138

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Jan 2016 18:00:06 +0100
parents 15eefe1b0dad
children 81794242a275
comparison
equal deleted inserted replaced
7678:186ca15645b1 7679:c80284cfe1b8
1435 { 1435 {
1436 gui.dying = TRUE; 1436 gui.dying = TRUE;
1437 EMSG(_((char *)e_opendisp)); 1437 EMSG(_((char *)e_opendisp));
1438 return FAIL; 1438 return FAIL;
1439 } 1439 }
1440 #ifdef USE_GRESOURCE
1441 gui_gtk_register_resource();
1442 #endif
1443 return OK; 1440 return OK;
1444 } 1441 }
1445 1442
1446 /* 1443 /*
1447 * Check if the GUI can be started. Called before gvimrc is sourced but after 1444 * Check if the GUI can be started. Called before gvimrc is sourced but after
1449 * Return OK or FAIL. 1446 * Return OK or FAIL.
1450 */ 1447 */
1451 int 1448 int
1452 gui_mch_init_check(void) 1449 gui_mch_init_check(void)
1453 { 1450 {
1451 #ifdef USE_GRESOURCE
1452 static int res_registered = FALSE;
1453
1454 if (!res_registered)
1455 {
1456 /* Call this function in the GUI process; otherwise, the resources
1457 * won't be available. Don't call it twice. */
1458 res_registered = TRUE;
1459 gui_gtk_register_resource();
1460 }
1461 #endif
1462
1454 #ifdef FEAT_GUI_GNOME 1463 #ifdef FEAT_GUI_GNOME
1455 if (gtk_socket_id == 0) 1464 if (gtk_socket_id == 0)
1456 using_gnome = 1; 1465 using_gnome = 1;
1457 #endif 1466 #endif
1458 1467