fix included modules case.

2001-01-26  Havoc Pennington  <hp@redhat.com>

	* gdk-pixbuf-io.c (mname): fix included modules case.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index e9341230cf015c5dee807e2a02e99ab49ffe8918..cfcbd81f6c528f82b7460576eef85c3ebe9d6fac 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-26  Havoc Pennington  <hp@redhat.com>
+
+       * gdk-pixbuf-io.c (mname): fix included modules case.
+
+2001-01-22  Havoc Pennington  <hp@redhat.com>
+
+       * gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): check errors 
+       from gdk_pixbuf_load_module
+
 2001-01-22  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am: Add built marshaller files to support

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index ef675dc06860f68f87265d44efd6973df5f8eec2..f6c81af66f3493171cec63ac851d1eb27e59b659 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -322,7 +322,7 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 }
 #else
 
-#define mname(type,fn) gdk_pixbuf__ ## type ## _image_ ##fn
+#define mname(type,fn) gdk_pixbuf__ ## type ## _ ##fn
 #define m_fill_vtable(type) extern void mname(type,fill_vtable) (GdkPixbufModule *module)
 
 m_fill_vtable (png);
@@ -602,10 +602,16 @@ gdk_pixbuf_new_from_xpm_data (const char **data)
 {
        GdkPixbuf *(* load_xpm_data) (const char **data);
        GdkPixbuf *pixbuf;
+        GError *error = NULL;
 
-       if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL)
-               gdk_pixbuf_load_module (&file_formats[XPM_FILE_FORMAT_INDEX], NULL);
-
+       if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL) {
+                if (!gdk_pixbuf_load_module (&file_formats[XPM_FILE_FORMAT_INDEX], &error)) {
+                        g_warning ("Error loading XPM image loader: %s", error->message);
+                        g_error_free (error);
+                        return FALSE;
+                }
+        }
+          
        if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL) {
                g_warning ("Can't find gdk-pixbuf module for parsing inline XPM data");
                return NULL;