Don't fail to load modules with suffix .la. (#480122, Andrey Tsyvarev)

2007-12-22  Matthias Clasen  <mclasen@redhat.com>

        * gmodule.c (g_module_open): Don't fail to load modules
        with suffix .la.  (#480122, Andrey Tsyvarev)



svn path=/trunk/; revision=6191
This commit is contained in:
Matthias Clasen 2007-12-23 05:50:26 +00:00 committed by Matthias Clasen
parent 2a7f1a1a9c
commit b15b1eb10e
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2007-12-22 Matthias Clasen <mclasen@redhat.com>
* gmodule.c (g_module_open): Don't fail to load modules
with suffix .la. (#480122, Andrey Tsyvarev)
2007-12-20 Matthias Clasen <mclasen@redhat.com> 2007-12-20 Matthias Clasen <mclasen@redhat.com>
* === Released 2.15.0 === * === Released 2.15.0 ===

View File

@ -428,8 +428,11 @@ g_module_open (const gchar *file_name,
gchar *real_name = parse_libtool_archive (name); gchar *real_name = parse_libtool_archive (name);
/* real_name might be NULL, but then module error is already set */ /* real_name might be NULL, but then module error is already set */
g_free (name); if (real_name)
name = real_name; {
g_free (name);
name = real_name;
}
} }
if (name) if (name)
handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0, handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0,