factory: Define GTK_DISABLE_DEPRECATED for the deprecated sources

3 files changed, 29 insertions, 25 deletions

diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 80280c0..9c5442c 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -161,23 +161,6 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         NULL);
   champlain_map_source_factory_register (factory, desc);
 
-/* Not available any more - remove completely in the next release */
-#if 0
-  desc = champlain_map_source_desc_new_full (
-        CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
-        "OpenStreetMap Osmarender",
-        "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/",
-        0,
-        17,
-        256,
-        CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://a.tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png",
-        champlain_map_source_new_generic,
-        NULL);
-  champlain_map_source_factory_register (factory, desc);
-#endif
-
   desc = champlain_map_source_desc_new_full (
         CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST,
         "MapQuest OSM",
@@ -234,8 +217,8 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         NULL);
   champlain_map_source_factory_register (factory, desc);
 
+/* Not available any more - remove completely in the next release */
 #if 0
-/* Disabling until OpenArealMap works again */
   desc = champlain_map_source_desc_new_full (
         CHAMPLAIN_MAP_SOURCE_OAM,
         "OpenAerialMap",
@@ -249,6 +232,20 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
+
+  desc = champlain_map_source_desc_new_full (
+        CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
+        "OpenStreetMap Osmarender",
+        "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
+        "http://creativecommons.org/licenses/by-sa/2.0/",
+        0,
+        17,
+        256,
+        CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+        "http://a.tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png",
+        champlain_map_source_new_generic,
+        NULL);
+  champlain_map_source_factory_register (factory, desc);
 #endif
 
   desc = champlain_map_source_desc_new_full (
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index fad2bcc..8655845 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -96,6 +96,7 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
  * OpenStreetMap Mapnik
  */
 #define CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK "osm-mapnik"
+#ifndef GTK_DISABLE_DEPRECATED
 /**
  * CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER:
  *
@@ -107,6 +108,17 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
  */
 #define CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER "osm-osmarender"
 /**
+ * CHAMPLAIN_MAP_SOURCE_OAM:
+ *
+ * OpenAerialMap
+ *
+ * Deprecated: OpenAerialMap isn't available any more and will be removed in the next release.
+ * As it doens't exist, it isn't registered to the factory and the 'create' method won't
+ * return any source.
+ */
+#define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
+#endif
+/**
  * CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST:
  *
  * Mapquest OpenStreetMap
@@ -131,12 +143,6 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
  */
 #define CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP "osm-transportmap"
 /**
- * CHAMPLAIN_MAP_SOURCE_OAM:
- *
- * OpenAerialMap
- */
-#define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
-/**
  * CHAMPLAIN_MAP_SOURCE_MFF_RELIEF:
  *
  * Maps for Free Relief
diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt
index f979f98..529943a 100644
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -440,12 +440,13 @@ champlain_map_source_factory_create_error_source
 champlain_map_source_factory_register
 champlain_map_source_factory_get_registered
 CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK
-CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER
 CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP
 CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP
 CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP
 CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST
 CHAMPLAIN_MAP_SOURCE_MFF_RELIEF
+CHAMPLAIN_MAP_SOURCE_OAM
+CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER
 CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL
 CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK
 <SUBSECTION Standard>