Use G_MODULE_BIND_LAZY when opening modules.

2005-12-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesystem.c (gtk_file_system_module_load):
	* gtk/gtkimmodule.c (gtk_im_module_load):
	* gtk/gtkthemes.c (gtk_theme_engine_load):
	* gtk/gtkmodules.c (find_module): Use G_MODULE_BIND_LAZY when
	opening modules.

diff --git a/ChangeLog b/ChangeLog
index 72d8759cb94f4cbcc7aee6cf77c3a5724aab263e..c0957a8e509a35056d3f0a6c754d1d974d3f7a8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilesystem.c (gtk_file_system_module_load): 
+       * gtk/gtkimmodule.c (gtk_im_module_load): 
+       * gtk/gtkthemes.c (gtk_theme_engine_load): 
+       * gtk/gtkmodules.c (find_module): Use G_MODULE_BIND_LAZY when
+       opening modules.
+
        * gtk/gtksettings.[hc]: Rework the way the color scheme setting
        is inherited. Now the overriding is done on a per-color basis,
        rather than for the setting as a whole. This has the effect

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72d8759cb94f4cbcc7aee6cf77c3a5724aab263e..c0957a8e509a35056d3f0a6c754d1d974d3f7a8c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2005-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilesystem.c (gtk_file_system_module_load): 
+       * gtk/gtkimmodule.c (gtk_im_module_load): 
+       * gtk/gtkthemes.c (gtk_theme_engine_load): 
+       * gtk/gtkmodules.c (find_module): Use G_MODULE_BIND_LAZY when
+       opening modules.
+
        * gtk/gtksettings.[hc]: Rework the way the color scheme setting
        is inherited. Now the overriding is done on a per-color basis,
        rather than for the setting as a whole. This has the effect

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 66f5af1296b6f47e4808989f20416e97a585e434..c0876f176651554efce652e2e11694f84b45fc50 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf-io.c (_gdk_pixbuf_load_module_unlocked): Use
+       G_MODULE_BIND_LOCAL when opening modules.
+
 2005-12-14  Michael Natterer  <mitch@imendio.com>
 
        * io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new utility

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index ea7894bfead97bd2737d87353eb4d5cbb0792267..238fb0ff6c26b9dee04f7c5a87297337ac36368a 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -454,7 +454,7 @@ _gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
         g_return_val_if_fail (image_module->module == NULL, FALSE);
 
        path = image_module->module_path;
-       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_set_error (error,

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 63101d8c4a4b9de144a71533455a8cb6f10cc1dc..b679f6c725901e5131bf518d18754fb040f56663 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1075,7 +1075,7 @@ gtk_file_system_module_load (GTypeModule *module)
 {
   GtkFileSystemModule *fs_module = GTK_FILE_SYSTEM_MODULE (module);
   
-  fs_module->library = g_module_open (fs_module->path, G_MODULE_BIND_LAZY);
+  fs_module->library = g_module_open (fs_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   if (!fs_module->library)
     {
       g_warning (g_module_error());

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 3d2983a2e2c60bc0b7ece5655775bdd7a29d84db..a6d6531f1f477ba25f3b262532a1adf03264e902 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -95,7 +95,7 @@ gtk_im_module_load (GTypeModule *module)
 {
   GtkIMModule *im_module = GTK_IM_MODULE (module);
   
-  im_module->library = g_module_open (im_module->path, G_MODULE_BIND_LAZY);
+  im_module->library = g_module_open (im_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   if (!im_module->library)
     {
       g_warning (g_module_error());

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 33020f72fb498a5c9101ae4c08d7ad33086ef5a4..359cd8b678c0034d696ae0849c0bffa858b04134 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -236,7 +236,7 @@ find_module (const gchar *name)
       module_name = g_module_build_path (NULL, name);
     }
 
-  module = g_module_open (module_name, G_MODULE_BIND_LAZY);
+  module = g_module_open (module_name, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   g_free(module_name);
 
   return module;

diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 1362552c68f389065407eda28cb423cac6253c4d..784093554522c9e3ded1699cd35b0f2a9769719d 100644 (file)
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -77,7 +77,7 @@ gtk_theme_engine_load (GTypeModule *module)
   
   GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path));
        
-  engine->library = g_module_open (engine_path, G_MODULE_BIND_LAZY);
+  engine->library = g_module_open (engine_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   g_free(engine_path);
   if (!engine->library)
     {