summaryrefslogtreecommitdiffstats
path: root/src/gui_gtk_x11.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-12-29 18:55:46 +0100
committerBram Moolenaar <Bram@vim.org>2015-12-29 18:55:46 +0100
commit36e294c00c784b9ddd05a4fdbea2e331ab2b1ca8 (patch)
tree77faf338e0f4e46d4d80c20781c6a08124b40ce7 /src/gui_gtk_x11.c
parent4e5a31c8b3e259605f4d8543aaae68578cf9b0d7 (diff)
patch 7.4.995v7.4.995
Problem: gdk_pixbuf_new_from_inline() is deprecated. Solution: Generate auto/gui_gtk_gresources.c. (Kazunobu Kazunobu, closes #507)
Diffstat (limited to 'src/gui_gtk_x11.c')
-rw-r--r--src/gui_gtk_x11.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 9b3bf61c76..e543b0a375 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -22,6 +22,9 @@
*/
#include "vim.h"
+#ifdef USE_GRESOURCE
+#include "auto/gui_gtk_gresources.h"
+#endif
#ifdef FEAT_GUI_GNOME
/* Gnome redefines _() and N_(). Grrr... */
@@ -1434,6 +1437,9 @@ gui_mch_early_init_check(void)
EMSG(_((char *)e_opendisp));
return FAIL;
}
+#ifdef USE_GRESOURCE
+ gui_gtk_register_resource();
+#endif
return OK;
}
@@ -3620,6 +3626,9 @@ mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
IOSIZE - 1);
preserve_exit();
}
+#ifdef USE_GRESOURCE
+ gui_gtk_unregister_resource();
+#endif
}