Mercurial > emacs
changeset 100826:dd451a5b1d77
(Qgobject): New symbol.
(syms_of_image): Initialize it.
(init_svg_functions): Load some functions from gobject library.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 02 Jan 2009 12:10:06 +0000 |
| parents | aa7072ec5fe2 |
| children | c1719c2265fc |
| files | src/ChangeLog src/image.c |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jan 01 19:58:00 2009 +0000 +++ b/src/ChangeLog Fri Jan 02 12:10:06 2009 +0000 @@ -1,3 +1,9 @@ +2009-01-02 Jason Rumney <jasonr@gnu.org> + + * image.c: (Qgobject): New symbol. + (syms_of_image): Initialize it. + (init_svg_functions): Load some functions from gobject library. + 2009-01-01 Dan Nicolaescu <dann@ics.uci.edu> * frame.c (make_terminal_frame): Remove redundant code and useless
--- a/src/image.c Thu Jan 01 19:58:00 2009 +0000 +++ b/src/image.c Fri Jan 02 12:10:06 2009 +0000 @@ -7898,14 +7898,15 @@ DEF_IMGLIB_FN (g_object_unref); DEF_IMGLIB_FN (g_error_free); -Lisp_Object Qgdk_pixbuf, Qglib; +Lisp_Object Qgdk_pixbuf, Qglib, Qgobject; static int init_svg_functions (Lisp_Object libraries) { - HMODULE library, gdklib, glib; + HMODULE library, gdklib, glib, gobject; if (!(glib = w32_delayed_load (libraries, Qglib)) + || !(gobject = w32_delayed_load (libraries, Qgobject)) || !(gdklib = w32_delayed_load (libraries, Qgdk_pixbuf)) || !(library = w32_delayed_load (libraries, Qsvg))) return 0; @@ -7926,9 +7927,10 @@ LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_has_alpha); LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_bits_per_sample); - LOAD_IMGLIB_FN (glib, g_type_init); - LOAD_IMGLIB_FN (glib, g_object_unref); + LOAD_IMGLIB_FN (gobject, g_type_init); + LOAD_IMGLIB_FN (gobject, g_object_unref); LOAD_IMGLIB_FN (glib, g_error_free); + return 1; } @@ -8742,10 +8744,13 @@ staticpro (&Qsvg); ADD_IMAGE_TYPE (Qsvg); #ifdef HAVE_NTGUI + /* Other libraries used directly by svg code. */ Qgdk_pixbuf = intern ("gdk-pixbuf"); staticpro (&Qgdk_pixbuf); Qglib = intern ("glib"); staticpro (&Qglib); + Qgobject = intern ("gobject"); + staticpro (&Qgobject); #endif /* HAVE_NTGUI */ #endif /* HAVE_RSVG */