From 7014a8ed1f8869a37bcf121ff0e92a6fc5656d80 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Thu, 11 Jun 2009 23:18:20 -0400 Subject: [PATCH] Reintroduce deleted functions and mark them as deprecated They will be removed just before releasing 0.4. --- champlain/champlain-cache.c | 6 ++++++ champlain/champlain-cache.h | 1 + champlain/champlain-map-source-factory.c | 12 ++++++++++++ champlain/champlain-map-source-factory.h | 2 ++ champlain/champlain-network-map-source.c | 6 ++++++ champlain/champlain-network-map-source.h | 3 +++ 6 files changed, 30 insertions(+) diff --git a/champlain/champlain-cache.c b/champlain/champlain-cache.c index 77b5481..7adc7b8 100644 --- a/champlain/champlain-cache.c +++ b/champlain/champlain-cache.c @@ -292,6 +292,12 @@ champlain_cache_dup_default (void) return g_object_new (CHAMPLAIN_TYPE_CACHE, NULL); } +ChamplainCache* +champlain_cache_get_default (void) +{ + return champlain_cache_dup_default (); +} + /** * champlain_cache_get_size_limit: * @self: the #ChamplainCache diff --git a/champlain/champlain-cache.h b/champlain/champlain-cache.h index 818aa76..e0ff236 100644 --- a/champlain/champlain-cache.h +++ b/champlain/champlain-cache.h @@ -55,6 +55,7 @@ typedef struct { GType champlain_cache_get_type (void); ChamplainCache* champlain_cache_dup_default (void); +ChamplainCache* champlain_cache_get_default (void) G_GNUC_DEPRECATED; void champlain_cache_update_tile (ChamplainCache *self, ChamplainTile *tile, diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c index ce10ec4..9a0214d 100644 --- a/champlain/champlain-map-source-factory.c +++ b/champlain/champlain-map-source-factory.c @@ -253,6 +253,12 @@ champlain_map_source_factory_dup_default (void) return g_object_new (CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, NULL); } +ChamplainMapSourceFactory * +champlain_map_source_factory_get_default (void) +{ + return champlain_map_source_factory_dup_default (); +} + /** * champlain_map_source_factory_dup_list: * @@ -267,6 +273,12 @@ champlain_map_source_factory_dup_list (ChamplainMapSourceFactory *factory) return g_slist_copy (factory->priv->registered_sources); } +GSList * +champlain_map_source_factory_get_list (ChamplainMapSourceFactory *factory) +{ + return champlain_map_source_factory_dup_list (factory); +} + /** * champlain_map_source_factory_create: * @factory: the Factory diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h index ff2546c..af2aaf1 100644 --- a/champlain/champlain-map-source-factory.h +++ b/champlain/champlain-map-source-factory.h @@ -56,8 +56,10 @@ struct _ChamplainMapSourceFactoryClass GType champlain_map_source_factory_get_type (void); ChamplainMapSourceFactory * champlain_map_source_factory_dup_default (void); +ChamplainMapSourceFactory * champlain_map_source_factory_get_default (void) G_GNUC_DEPRECATED; GSList * champlain_map_source_factory_dup_list (ChamplainMapSourceFactory *factory); +GSList * champlain_map_source_factory_get_list (ChamplainMapSourceFactory *factory) G_GNUC_DEPRECATED; ChamplainMapSource * champlain_map_source_factory_create (ChamplainMapSourceFactory *factory, const gchar *id); diff --git a/champlain/champlain-network-map-source.c b/champlain/champlain-network-map-source.c index 994f269..1860c80 100644 --- a/champlain/champlain-network-map-source.c +++ b/champlain/champlain-network-map-source.c @@ -655,3 +655,9 @@ fill_tile (ChamplainMapSource *map_source, g_object_unref (cache); } +void +champlain_network_map_source_fill_tile (ChamplainMapSource *map_source, + ChamplainTile *tile) +{ + fill_tile (map_source, tile); +} diff --git a/champlain/champlain-network-map-source.h b/champlain/champlain-network-map-source.h index cb06422..9cce198 100644 --- a/champlain/champlain-network-map-source.h +++ b/champlain/champlain-network-map-source.h @@ -72,6 +72,9 @@ gchar * champlain_network_map_source_get_tile_uri (ChamplainNetworkMapSource *so void champlain_network_map_source_set_uri_format (ChamplainNetworkMapSource *source, const gchar *uri_format); +void champlain_network_map_source_fill_tile (ChamplainMapSource *map_source, + ChamplainTile *tile) G_GNUC_DEPRECATED; + G_END_DECLS #endif -- 2.39.5