luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds GIO_EXTRA_MODULES environment variable support, closing bug #523039.

Browse Source 
2008-03-28  A. Walton  <awalton@svn.gnome.org>

	* giomodule.c (_g_io_modules_ensure_loaded):
	Adds GIO_EXTRA_MODULES environment variable support, closing bug 
	#523039.


svn path=/trunk/; revision=6768
This commit is contained in:
A. Walton
2008-03-28 14:31:09 +00:00
committed by Andrew Walton
parent 4824b7dbb0
commit 096201834d
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-03-28 A. Walton <awalton@svn.gnome.org>
* gio/overview.xml:
Document GIO_EXTRA_MODULES, fixes a small typo.
2008-03-19 Matthias Clasen <mclasen@redhat.com> 2008-03-19 Matthias Clasen <mclasen@redhat.com>
* gio/overview.xml: Document GVS_DISABLE_FUSE. * gio/overview.xml: Document GVS_DISABLE_FUSE.

12
docs/reference/gio/overview.xml
View File

@@ -185,7 +185,7 @@
<para> <para>
This variable can be set to the name of a #GDesktopAppInfoLookup This variable can be set to the name of a #GDesktopAppInfoLookup
implementation to override the dfeault for debugging purposes. implementation to override the default for debugging purposes.
GIO does not include a #GDesktopAppInfoLookup implementation, GIO does not include a #GDesktopAppInfoLookup implementation,
the GConf-based implementation in the gvfs module has the name the GConf-based implementation in the gvfs module has the name
"gconf". "gconf".
@@ -203,6 +203,16 @@
</para> </para>
</formalpara> </formalpara>
<formalpara>
<title><envar>GIO_EXTRA_MODULES</envar></title>
<para>
When this environment variable is set to a path, or a set of
paths separated by a colon, GIO will attempt to load
modules from within the path.
</para>
</formalpara>
</chapter> </chapter>
<chapter id="gio-extension-points"> <chapter id="gio-extension-points">

6
gio/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-03-28 A. Walton <awalton@svn.gnome.org>
* giomodule.c (_g_io_modules_ensure_loaded):
Adds GIO_EXTRA_MODULES environment variable support, closing bug
#523039.
2008-03-28 Alexander Larsson <alexl@redhat.com> 2008-03-28 Alexander Larsson <alexl@redhat.com>
* gfile.c: * gfile.c:

18
gio/giomodule.c
View File

@@ -300,6 +300,7 @@ _g_io_modules_ensure_loaded (void)
GList *modules, *l; GList *modules, *l;
static gboolean loaded_dirs = FALSE; static gboolean loaded_dirs = FALSE;
GIOExtensionPoint *ep; GIOExtensionPoint *ep;
const char *module_path;
G_LOCK (loaded_dirs); G_LOCK (loaded_dirs);
@@ -329,6 +330,23 @@ _g_io_modules_ensure_loaded (void)
modules = g_io_modules_load_all_in_directory (GIO_MODULE_DIR); modules = g_io_modules_load_all_in_directory (GIO_MODULE_DIR);
module_path = g_getenv ("GIO_EXTRA_MODULES");
if (module_path)
{
int i = 0;
gchar **paths;
paths = g_strsplit (module_path, ":", 0);
while (paths[i] != NULL)
{
modules = g_list_prepend (modules, g_io_modules_load_all_in_directory (paths[i]));
i++;
}
g_strfreev (paths);
}
/* Initialize types from built-in "modules" */ /* Initialize types from built-in "modules" */
#if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H) #if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H)
_g_inotify_directory_monitor_get_type (); _g_inotify_directory_monitor_get_type ();