Enable a clear icon on entry boxes used for search like input.

[andy/viking.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index 21325245ec10ea10e8fba5e575145ded35999926..85b6820bb94391b9883c7bdfe84e07cd97f2e60c 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -235,6 +235,11 @@ register_loadable_types(void)
  */
 void modules_init()
 {
+// OSM done first so this will be the default service for searching/routing/etc...
+#ifdef VIK_CONFIG_OPENSTREETMAP
+  osm_init();
+  osm_traces_init();
+#endif
 #ifdef VIK_CONFIG_BING
   bing_init();
 #endif
@@ -247,10 +252,6 @@ void modules_init()
 #ifdef VIK_CONFIG_TERRASERVER
   terraserver_init();
 #endif
-#ifdef VIK_CONFIG_OPENSTREETMAP
-  osm_init();
-  osm_traces_init();
-#endif
 #ifdef VIK_CONFIG_BLUEMARBLE
   bluemarble_init();
 #endif
@@ -275,10 +276,13 @@ void modules_init()
  * modules_post_init:
  *
  * Secondary stage initialization
- * Can now use a_get_preferences()
+ * Can now use a_get_preferences() and a_babel_available()
  */
 void modules_post_init ()
 {
+#ifdef VIK_CONFIG_GOOGLE
+  google_post_init();
+#endif
 #ifdef HAVE_LIBMAPNIK
   vik_mapnik_layer_post_init();
 #endif