aboutsummaryrefslogtreecommitdiff
Allow the configuration file to be specified via an environment variable.

diff --git a/src/gclue-config.c b/src/gclue-config.c
index 7ab2a67..e41f3df 100644
--- a/src/gclue-config.c
+++ b/src/gclue-config.c
@@ -332,6 +332,11 @@ static void
 gclue_config_init (GClueConfig *config)
 {
         GError *error = NULL;
+	const char *config_file_path;
+
+	config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE");
+	if (!config_file_path)
+            config_file_path = CONFIG_FILE_PATH;
 
         config->priv = gclue_config_get_instance_private(config);
         config->priv->key_file = g_key_file_new ();
@@ -341,7 +346,7 @@ gclue_config_init (GClueConfig *config)
                                    &error);
         if (error != NULL) {
                 g_critical ("Failed to load configuration file '%s': %s",
-                            CONFIG_FILE_PATH, error->message);
+                            config_file_path, error->message);
                 g_error_free (error);
 
                 return;
cfbbff74aee4c9a7abe1936'>gnu: wmfire: Update source code for new GDK versions....Kei Kebreau 2017-03-14gnu: windowmaker: Use modify-phases syntax....Leo Famulari 2017-03-14gnu: windowmaker: Update to 0.95.8....Leo Famulari 2016-12-09gnu: windowmaker: Fix invocation of 'wmsetbg'....Kei Kebreau 2016-10-27gnu: windowmaker: Add support for more image formats....Kei Kebreau 2016-10-23gnu: windowmaker: Update to 0.95.7....Kei Kebreau 2016-07-29gnu: Remove trailing periods from synopsis....David Craven 2016-05-18gnu: wmbattery: Fix UPower-related memory leak....Kei Yamashita 2016-05-09gnu: Add wmfire....Kei Yamashita 2016-04-08gnu: Add wmclock....Kei Yamashita 2016-04-06gnu: Add wmcpuload....Kei Yamashita 2016-04-06gnu: Add wmnd....Kei Yamashita 2016-04-05gnu: Add wmbattery....Kei Yamashita