mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-02 16:17:27 +01:00
e5c1a708f5
* gnu/packages/gnome.scm (geoclue): Update to 2.7.2. * gnu/packages/patches/geoclue-config.patch: Adjust. Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
Allow the configuration file to be specified via an environment variable.
|
|
|
|
---
|
|
src/gclue-config.c | 13 ++++++++++---
|
|
src/gclue-static-source.c | 2 +-
|
|
2 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/gclue-config.c b/src/gclue-config.c
|
|
index acd6009..3045571 100644
|
|
--- a/src/gclue-config.c
|
|
+++ b/src/gclue-config.c
|
|
@@ -26,8 +26,8 @@
|
|
|
|
#include "gclue-config.h"
|
|
|
|
-#define CONFIG_FILE_PATH SYSCONFDIR "/geoclue/geoclue.conf"
|
|
-#define CONFIG_D_DIRECTORY SYSCONFDIR "/geoclue/conf.d/"
|
|
+#define CONFIG_FILE_PATH "/etc/geoclue/geoclue.conf"
|
|
+#define CONFIG_D_DIRECTORY "/etc/geoclue/conf.d/"
|
|
|
|
/* This class will be responsible for fetching configuration. */
|
|
|
|
@@ -546,8 +546,15 @@ gclue_config_init (GClueConfig *config)
|
|
priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL);
|
|
priv->wifi_submit_nick = g_strdup (DEFAULT_WIFI_SUBMIT_NICK);
|
|
|
|
- /* Load config file from default path, log all missing parameters */
|
|
priv->key_file = g_key_file_new ();
|
|
+
|
|
+ char *env_config_file = g_getenv ("GEOCLUE_CONFIG_FILE");
|
|
+ if (env_config_file) {
|
|
+ load_config_file (config, env_config_file);
|
|
+ goto out; // don't load conf.d
|
|
+ }
|
|
+
|
|
+ /* Load config file from default path, log all missing parameters */
|
|
load_config_file (config, CONFIG_FILE_PATH);
|
|
|
|
/*
|
|
diff --git a/src/gclue-static-source.c b/src/gclue-static-source.c
|
|
index 1c35cea..7957797 100644
|
|
--- a/src/gclue-static-source.c
|
|
+++ b/src/gclue-static-source.c
|
|
@@ -26,7 +26,7 @@
|
|
#include "gclue-enum-types.h"
|
|
|
|
#define GEO_FILE_NAME "geolocation"
|
|
-#define GEO_FILE_PATH SYSCONFDIR "/" GEO_FILE_NAME
|
|
+#define GEO_FILE_PATH "/etc/" GEO_FILE_NAME
|
|
|
|
/* Rate limit of geolocation file monitoring.
|
|
* In milliseconds.
|
|
--
|
|
2.46.0
|
|
|