Mercurial > vim

comparison src/gui_gtk_x11.c @ 7380:055a0b587a3e v7.4.995

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/36e294c00c784b9ddd05a4fdbea2e331ab2b1ca8 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 29 18:55:46 2015 +0100 patch 7.4.995 Problem: gdk_pixbuf_new_from_inline() is deprecated. Solution: Generate auto/gui_gtk_gresources.c. (Kazunobu Kazunobu, closes https://github.com/vim/vim/issues/507)
author Christian Brabandt <cb@256bit.org>
date Tue, 29 Dec 2015 19:00:05 +0100
parents 8ba562cb3e07
children 15eefe1b0dad
comparison
equal deleted inserted replaced
7379:0463a4e8a4f0 7380:055a0b587a3e
20 * (C) 2002,2003 Jason Hildebrand <jason@peaceworks.ca> 20 * (C) 2002,2003 Jason Hildebrand <jason@peaceworks.ca>
21 * Daniel Elstner <daniel.elstner@gmx.net> 21 * Daniel Elstner <daniel.elstner@gmx.net>
22 */ 22 */
23 23
24 #include "vim.h" 24 #include "vim.h"
25 #ifdef USE_GRESOURCE
26 #include "auto/gui_gtk_gresources.h"
27 #endif
25 28
26 #ifdef FEAT_GUI_GNOME 29 #ifdef FEAT_GUI_GNOME
27 /* Gnome redefines _() and N_(). Grrr... */ 30 /* Gnome redefines _() and N_(). Grrr... */
28 # ifdef _ 31 # ifdef _
29 # undef _ 32 # undef _
1432 { 1435 {
1433 gui.dying = TRUE; 1436 gui.dying = TRUE;
1434 EMSG(_((char *)e_opendisp)); 1437 EMSG(_((char *)e_opendisp));
1435 return FAIL; 1438 return FAIL;
1436 } 1439 }
1440 #ifdef USE_GRESOURCE
1441 gui_gtk_register_resource();
1442 #endif
1437 return OK; 1443 return OK;
1438 } 1444 }
1439 1445
1440 /* 1446 /*
1441 * Check if the GUI can be started. Called before gvimrc is sourced but after 1447 * Check if the GUI can be started. Called before gvimrc is sourced but after
3618 vim_strncpy(IObuff, 3624 vim_strncpy(IObuff,
3619 (char_u *)_("Vim: Main window unexpectedly destroyed\n"), 3625 (char_u *)_("Vim: Main window unexpectedly destroyed\n"),
3620 IOSIZE - 1); 3626 IOSIZE - 1);
3621 preserve_exit(); 3627 preserve_exit();
3622 } 3628 }
3629 #ifdef USE_GRESOURCE
3630 gui_gtk_unregister_resource();
3631 #endif
3623 } 3632 }
3624 3633
3625 3634
3626 /* 3635 /*
3627 * Bit of a hack to ensure we start GtkPlug windows with the correct window 3636 * Bit of a hack to ensure we start GtkPlug windows with the correct window