[gvfs] Allow specifying the dir for .monitor files
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] Allow specifying the dir for .monitor files
- Date: Fri, 12 Oct 2012 08:45:56 +0000 (UTC)
commit b906a5ef2d395c59908d7aa954589e249a22993a
Author: Alexander Larsson <alexl redhat com>
Date: Fri Oct 12 10:47:33 2012 +0200
Allow specifying the dir for .monitor files
This will also be used for the test suite
monitor/proxy/gproxyvolumemonitor.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
index 37fc788..7ee616e 100644
--- a/monitor/proxy/gproxyvolumemonitor.c
+++ b/monitor/proxy/gproxyvolumemonitor.c
@@ -1457,6 +1457,7 @@ g_proxy_volume_monitor_register (GIOModule *module)
{
GDir *dir;
GError *error;
+ const char *monitors_dir;
/* first register the abstract base type... */
g_proxy_volume_monitor_register_type (G_TYPE_MODULE (module));
@@ -1472,11 +1473,15 @@ g_proxy_volume_monitor_register (GIOModule *module)
* - and if so the priority
*/
+ monitors_dir = g_getenv ("GVFS_MONITOR_DIR");
+ if (monitors_dir == NULL || *monitors_dir == 0)
+ monitors_dir = REMOTE_VOLUME_MONITORS_DIR;
+
error = NULL;
- dir = g_dir_open (REMOTE_VOLUME_MONITORS_DIR, 0, &error);
+ dir = g_dir_open (monitors_dir, 0, &error);
if (dir == NULL)
{
- g_warning ("cannot open directory " REMOTE_VOLUME_MONITORS_DIR ": %s", error->message);
+ g_warning ("cannot open directory %s: %s", monitors_dir, error->message);
g_error_free (error);
}
else
@@ -1500,7 +1505,7 @@ g_proxy_volume_monitor_register (GIOModule *module)
if (!g_str_has_suffix (name, ".monitor"))
goto cont;
- path = g_build_filename (REMOTE_VOLUME_MONITORS_DIR, name, NULL);
+ path = g_build_filename (monitors_dir, name, NULL);
key_file = g_key_file_new ();
error = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]