X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/bf5cef4139b16cc3d036bb3b7c3495e9653b0a18..78af40635535da56ceb0b83ca15a7f6c8fc615bd:/src/modules.c

diff --git a/src/modules.c b/src/modules.c
index f1912b41..c8c146f8 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1,7 +1,7 @@
 /*
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
- * Copyright (C) 2006-2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (C) 2006-2012, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,21 +31,24 @@
 
 #include "modules.h"
 
+#include "bing.h"
+#include "spotmaps.h"
 #include "google.h"
 #include "terraserver.h"
 #include "expedia.h"
 #include "osm.h"
 #include "osm-traces.h"
 #include "bluemarble.h"
-#include "openaerial.h"
 #include "geonames.h"
-#include "file.h"
+#include "dir.h"
 #include "vikmapslayer.h"
 #include "vikexttools.h"
+#include "vikgoto.h"
 #include "vikgobjectbuilder.h"
 
 #define VIKING_MAPS_FILE "maps.xml"
 #define VIKING_EXTTOOLS_FILE "external_tools.xml"
+#define VIKING_GOTOTOOLS_FILE "goto_tools.xml"
 
 static void
 modules_register_map_source(VikGobjectBuilder *self, GObject *object)
@@ -65,10 +68,20 @@ modules_register_exttools(VikGobjectBuilder *self, GObject *object)
 }
 
 static void
-modules_load_config(void)
+modules_register_gototools(VikGobjectBuilder *self, GObject *object)
 {
+  g_debug (__FUNCTION__);
+  VikGotoTool *tool = VIK_GOTO_TOOL (object);
+  vik_goto_register (tool);
+}
+
+static void
+modules_load_config_dir(const gchar *dir)
+{
+  g_debug("Loading configurations from directory %s", dir);
+
   /* Maps sources */
-  gchar *maps = g_build_filename(a_get_viking_dir(), VIKING_MAPS_FILE, NULL);
+  gchar *maps = g_build_filename(dir, VIKING_MAPS_FILE, NULL);
   if (g_access (maps, R_OK) == 0)
   {
 	VikGobjectBuilder *builder = vik_gobject_builder_new ();
@@ -78,7 +91,7 @@ modules_load_config(void)
   }
 
   /* External tools */
-  gchar *tools = g_build_filename(a_get_viking_dir(), VIKING_EXTTOOLS_FILE, NULL);
+  gchar *tools = g_build_filename(dir, VIKING_EXTTOOLS_FILE, NULL);
   if (g_access (tools, R_OK) == 0)
   {
 	VikGobjectBuilder *builder = vik_gobject_builder_new ();
@@ -86,10 +99,59 @@ modules_load_config(void)
 	vik_gobject_builder_parse (builder, tools);
 	g_object_unref (builder);
   }
+
+  /* Go-to search engines */
+  gchar *go_to = g_build_filename(dir, VIKING_GOTOTOOLS_FILE, NULL);
+  if (g_access (go_to, R_OK) == 0)
+  {
+	VikGobjectBuilder *builder = vik_gobject_builder_new ();
+	g_signal_connect (builder, "new-object", G_CALLBACK (modules_register_gototools), NULL);
+	vik_gobject_builder_parse (builder, go_to);
+	g_object_unref (builder);
+  }
+}
+
+static void
+modules_load_config(void)
+{
+  /* Look in the directories of data path */
+  gchar * * data_dirs = a_get_viking_data_path();
+  /* Priority is standard one:
+     left element is more important than right one.
+     But our logic is to load all existing files and overwrite
+     overlapping config with last recent one.
+     So, we have to process directories in reverse order. */
+  /* First: find the last element */
+  gchar * * ptr = data_dirs;
+  while (*ptr != NULL) ptr++;
+  /* Second: deduce the number of directories */
+  int nb_data_dirs = 0;
+  nb_data_dirs = ptr - data_dirs;
+  /* Last: parse them in reverse order */
+  for (; nb_data_dirs > 0 ; nb_data_dirs--)
+  {
+    modules_load_config_dir(data_dirs[nb_data_dirs-1]);
+  }
+  g_strfreev(data_dirs);
+	
+  /* Check if system config is set */
+  modules_load_config_dir(VIKING_SYSCONFDIR);
+
+  const gchar *data_home = a_get_viking_data_home ();
+  if (data_home)
+  {
+    modules_load_config_dir(data_home);
+  }
+	
+  /* Check user's home config */
+  modules_load_config_dir(a_get_viking_dir());
 }
 
 void modules_init()
 {
+#ifdef VIK_CONFIG_BING
+  bing_init();
+#endif
 #ifdef VIK_CONFIG_GOOGLE 
   google_init();
 #endif
@@ -106,13 +168,13 @@ void modules_init()
 #ifdef VIK_CONFIG_BLUEMARBLE
   bluemarble_init();
 #endif
-#ifdef VIK_CONFIG_OPENAERIAL
-  openaerial_init();
-#endif
 #ifdef VIK_CONFIG_GEONAMES
   geonames_init();
 #endif
-  
+#ifdef VIK_CONFIG_SPOTMAPS
+  spotmaps_init();
+#endif
+
   /* As modules are loaded, we can load configuration files */
   modules_load_config ();
 }