AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use _gdk_pixbuf_load_module_unlocked() in the !USE_GMODULE case.

Browse Source 
2004-11-12  Matthias Clasen  <mclasen@redhat.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_io_init): Don't use
	_gdk_pixbuf_load_module_unlocked() in the !USE_GMODULE case.
This commit is contained in:
Matthias Clasen 2004-11-12 20:43:08 +00:00 committed by Matthias Clasen
parent 74a5fd15d7
commit 9e847e411f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk-pixbuf/ChangeLog
View File

@ -1,5 +1,8 @@
2004-11-12 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-io.c (gdk_pixbuf_io_init): Don't use
_gdk_pixbuf_load_module_unlocked() in the !USE_GMODULE case.
* === Released 2.5.5 ===
2004-11-12 Matthias Clasen <mclasen@redhat.com>

12
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -243,7 +243,7 @@ correct_prefix (gchar **path)
}
}
#endif
#endif /* G_OS_WIN32 */
static gchar *
gdk_pixbuf_get_module_file (void)
@ -424,7 +424,7 @@ _gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
char *path;
GModule *module;
gpointer sym;
g_return_val_if_fail (image_module->module == NULL, FALSE);
path = image_module->module_path;
@ -464,10 +464,10 @@ _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
G_LOCK (init_lock);
ret = _gdk_pixbuf_load_module_unlocked (image_module, error);
G_UNLOCK (init_lock);
return ret;
}
#else
#else /* !USE_GMODULE */
#define module(type) \
extern void MODULE_ENTRY (type, fill_info) (GdkPixbufFormat *info); \
@ -631,14 +631,14 @@ gdk_pixbuf_io_init ()
for (name = included_formats; *name; name++) {
module = g_new0 (GdkPixbufModule, 1);
module->module_name = *name;
if (_gdk_pixbuf_load_module_unlocked (module, NULL))
if (_gdk_pixbuf_load_module (module, NULL))
file_formats = g_slist_prepend (file_formats, module);
else
g_free (module);
}
}
#endif
#endif /* !USE_GMODULE */