[libchamplain] Remove Maemo stuff
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Remove Maemo stuff
- Date: Wed, 13 Jul 2016 18:27:25 +0000 (UTC)
commit c2124d379ec08a5daa35d74198baef77b14cc336
Author: Jiří Techet <techet gmail com>
Date: Wed Jul 13 19:43:14 2016 +0200
Remove Maemo stuff
Maemo is safely dead by now.
champlain/champlain-file-cache.c | 4 ----
champlain/champlain-map-source-factory.h | 16 ----------------
configure.ac | 13 -------------
3 files changed, 0 insertions(+), 33 deletions(-)
---
diff --git a/champlain/champlain-file-cache.c b/champlain/champlain-file-cache.c
index 6a4cb9e..d567ec1 100644
--- a/champlain/champlain-file-cache.c
+++ b/champlain/champlain-file-cache.c
@@ -280,13 +280,9 @@ champlain_file_cache_constructed (GObject *object)
if (!priv->cache_dir)
{
-#ifdef CHAMPLAIN_HAS_MAEMO
- priv->cache_dir = g_strdup ("/home/user/MyDocs/.Maps/");
-#else
priv->cache_dir = g_build_path (G_DIR_SEPARATOR_S,
g_get_user_cache_dir (),
"champlain", NULL);
-#endif
}
init_cache (file_cache);
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index ff4f9fc..f430e6a 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -91,7 +91,6 @@ gboolean champlain_map_source_factory_register (ChamplainMapSourceFactory *facto
ChamplainMapSourceDesc *desc);
GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *factory);
-#ifndef CHAMPLAIN_HAS_MAEMO
/**
* CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK:
*
@@ -181,21 +180,6 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
*/
#define CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE "owm-temperature"
-#else
-#define CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK "OpenStreetMap I"
-#define CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER "OpenStreetMap II"
-#define CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST "Mapquest OSM"
-#define CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP "Open Aerial Map"
-#define CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP "OpenCycleMap"
-#define CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP "Public Transport"
-#define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
-#define CHAMPLAIN_MAP_SOURCE_MFF_RELIEF "MapsForFree Relief"
-#define CHAMPLAIN_MAP_SOURCE_OWM_CLOUDS "OpenWeatherMap Clouds"
-#define CHAMPLAIN_MAP_SOURCE_OWM_PRECIPITATION "OpenWeatherMap Precipitation"
-#define CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE "OpenWeatherMap Pressure"
-#define CHAMPLAIN_MAP_SOURCE_OWM_WIND "OpenWeatherMap Wind"
-#define CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE "OpenWeatherMap Temperature"
-#endif
#ifdef CHAMPLAIN_HAS_MEMPHIS
/**
diff --git a/configure.ac b/configure.ac
index a9e3ba2..66b19dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,14 +96,6 @@ if test x$enable_debug = xyes; then
fi
# -----------------------------------------------------------
-# Enable Maemo optimizations
-# -----------------------------------------------------------
-
-AC_ARG_ENABLE(maemo,
- AS_HELP_STRING([--enable-maemo],[compile with maemo optimizations]),
- enable_maemo=$enableval, enable_maemo=no)
-
-# -----------------------------------------------------------
# Enable gtk
# -----------------------------------------------------------
@@ -191,14 +183,9 @@ CHAMPLAIN_CONFIG_COMMANDS([champlain/champlain-features.h],
echo '#define CHAMPLAIN_HAS_MEMPHIS 1'
echo ''
fi
- if test "x$enable_maemo" = "xyes"; then
- echo '#define CHAMPLAIN_HAS_MAEMO 1'
- echo ''
- fi
echo '#endif'
],[
enable_memphis="$enable_memphis"
- enable_maemo="$enable_maemo"
])
# ----------------------------------------------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]