summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2005-12-14 09:16:00 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2005-12-14 09:16:00 +0000
commit2768434106ac79de068470ebc816b9163027032f (patch)
treed682c64b9a699b64c57f02fec95f68302d77afa9
parent70b6e1a782d078a0944c579d831dc05dad410851 (diff)
downloadpango-2768434106ac79de068470ebc816b9163027032f.tar.gz
Pass G_MODULE_BIND_LOCAL to g_module_open. (Pointed by Federico)
2005-12-14 Behdad Esfahbod <behdad@gnome.org> * pango/modules.c (pango_module_load), pango/querymodules.c: Pass G_MODULE_BIND_LOCAL to g_module_open. (Pointed by Federico)
-rw-r--r--ChangeLog5
-rw-r--r--pango/modules.c2
-rw-r--r--pango/querymodules.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 264bebbe..eb68f932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango/modules.c (pango_module_load), pango/querymodules.c: Pass
+ G_MODULE_BIND_LOCAL to g_module_open. (Pointed by Federico)
+
2005-12-12 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.11.1 ===
diff --git a/pango/modules.c b/pango/modules.c
index 096d3b87..b208a846 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -169,7 +169,7 @@ pango_module_load (GTypeModule *module)
if (pango_module->path)
{
- pango_module->library = g_module_open (pango_module->path, G_MODULE_BIND_LAZY);
+ pango_module->library = g_module_open (pango_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!pango_module->library)
{
g_warning ("%s", g_module_error());
diff --git a/pango/querymodules.c b/pango/querymodules.c
index dc08e5cb..cf69471f 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -125,7 +125,7 @@ query_module (const char *dir, const char *name)
else
path = g_build_filename (dir, name, NULL);
- module = g_module_open (path, G_MODULE_BIND_LAZY);
+ module = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!module)
g_printerr ("Cannot load module %s: %s\n", path, g_module_error ());