gtk_object_sink has been deprecated since gtk version 2.10, use g_object_ref_sink...

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

diff --git a/src/modules.c b/src/modules.c
index 3d81a380e705d277703c069a53383cd9dd916b43..41818d5fe68b560381c90d649e9d544c76f45028 100644 (file)
--- 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-2010, 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,13 +31,14 @@
 
 #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 "vikmapslayer.h"
@@ -110,6 +111,9 @@ modules_load_config(void)
 
 void modules_init()
 {
+#ifdef VIK_CONFIG_BING
+  bing_init();
+#endif
 #ifdef VIK_CONFIG_GOOGLE 
   google_init();
 #endif
@@ -126,13 +130,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 ();
 }