[Emacs-diffs] emacs/src ChangeLog image.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/01/02 12:10:24

Modified files:
        src            : ChangeLog image.c 

Log message:
        (Qgobject): New symbol.
        (syms_of_image): Initialize it.
        (init_svg_functions): Load some functions from gobject library.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7245&r2=1.7246
http://cvs.savannah.gnu.org/viewcvs/emacs/src/image.c?cvsroot=emacs&r1=1.115&r2=1.116

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7245
retrieving revision 1.7246
diff -u -b -r1.7245 -r1.7246
--- ChangeLog   1 Jan 2009 19:58:00 -0000       1.7245
+++ ChangeLog   2 Jan 2009 12:10:06 -0000       1.7246
@@ -1,3 +1,9 @@
+2009-01-02  Jason Rumney  <address@hidden>
+
+       * image.c: (Qgobject): New symbol.
+       (syms_of_image): Initialize it.
+       (init_svg_functions): Load some functions from gobject library.
+
 2009-01-01  Dan Nicolaescu  <address@hidden>
 
        * frame.c (make_terminal_frame): Remove redundant code and useless

Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- image.c     25 Nov 2008 02:45:39 -0000      1.115
+++ image.c     2 Jan 2009 12:10:21 -0000       1.116
@@ -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  */