From 0a876523eba87e4ade1e18437b9cf47c3d54dfde Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 16 Dec 2005 19:06:09 +0000 Subject: [PATCH] Use G_MODULE_BIND_LAZY when opening modules. 2005-12-16 Matthias Clasen * 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. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/gdk-pixbuf-io.c | 2 +- gtk/gtkfilesystem.c | 2 +- gtk/gtkimmodule.c | 2 +- gtk/gtkmodules.c | 2 +- gtk/gtkthemes.c | 2 +- 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72d8759cb..c0957a8e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-12-16 Matthias Clasen + * 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 72d8759cb..c0957a8e5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2005-12-16 Matthias Clasen + * 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 66f5af129..c0876f176 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2005-12-16 Matthias Clasen + + * gdk-pixbuf-io.c (_gdk_pixbuf_load_module_unlocked): Use + G_MODULE_BIND_LOCAL when opening modules. + 2005-12-14 Michael Natterer * 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 ea7894bfe..238fb0ff6 100644 --- 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 63101d8c4..b679f6c72 100644 --- 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 3d2983a2e..a6d6531f1 100644 --- 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 33020f72f..359cd8b67 100644 --- 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 1362552c6..784093554 100644 --- 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) { -- 2.43.2