[glib/wip/gcleanup] giomodule: Allow overriding source directory gio modules are loaded from
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gcleanup] giomodule: Allow overriding source directory gio modules are loaded from
- Date: Sun, 10 Nov 2013 21:36:17 +0000 (UTC)
commit 730cfa5e12272c6c0401760cfa49316a63009f76
Author: Stef Walter <stefw gnome org>
Date: Fri Nov 8 14:26:33 2013 +0100
giomodule: Allow overriding source directory gio modules are loaded from
When testing (and valgrinding) we need to have a known set of modules
loaded.
https://bugzilla.gnome.org/show_bug.cgi?id=711801
gio/giomodule.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 76b61ae..adefe4c 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -1015,6 +1015,7 @@ _g_io_modules_ensure_loaded (void)
static gboolean loaded_dirs = FALSE;
const char *module_path;
GIOModuleScope *scope;
+ const gchar *module_dir;
_g_io_modules_ensure_extension_points_registered ();
@@ -1043,7 +1044,11 @@ _g_io_modules_ensure_loaded (void)
}
/* Then load the compiled in path */
- g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);
+ module_dir = g_getenv ("GIO_MODULE_DIR");
+ if (module_dir == NULL)
+ module_dir = GIO_MODULE_DIR;
+
+ g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
g_io_module_scope_free (scope);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]