From d4e2eba49f793c4a9dae920b8505ab494d4eb5cf Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Tue, 10 Mar 2009 21:22:08 +0200 Subject: [PATCH] Fix regression introduced when ChamplainMapSource was introduced --- champlain/champlain-map-source.c | 16 ++++++++++++++++ champlain/champlain-map-source.h | 8 ++++++-- champlain/champlain-view.c | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c index 9850b95..1359daa 100644 --- a/champlain/champlain-map-source.c +++ b/champlain/champlain-map-source.c @@ -391,3 +391,19 @@ champlain_map_source_set_name (ChamplainMapSource *map_source, priv->name = g_strdup (name); } +const gchar * +champlain_map_source_get_license (ChamplainMapSource *map_source) +{ + ChamplainMapSourcePrivate *priv = GET_PRIVATE (map_source); + return priv->license; +} + +void +champlain_map_source_set_license (ChamplainMapSource *map_source, + const char *license) +{ + ChamplainMapSourcePrivate *priv = GET_PRIVATE (map_source); + + priv->license = g_strdup (license); +} + diff --git a/champlain/champlain-map-source.h b/champlain/champlain-map-source.h index bcea848..796d5a3 100644 --- a/champlain/champlain-map-source.h +++ b/champlain/champlain-map-source.h @@ -63,8 +63,6 @@ struct _ChamplainMapSourceClass GType champlain_map_source_get_type (void); -const gchar * champlain_map_source_get_name (ChamplainMapSource *map_source); - gint champlain_map_source_get_min_zoom_level (ChamplainMapSource *map_source); gint champlain_map_source_get_max_zoom_level (ChamplainMapSource *map_source); @@ -94,5 +92,11 @@ void champlain_map_source_get_tile (ChamplainMapSource *map_source, void champlain_map_source_set_name (ChamplainMapSource *map_source, const char *name); +const gchar * champlain_map_source_get_name (ChamplainMapSource *map_source); + +void champlain_map_source_set_license (ChamplainMapSource *map_source, + const char *license); +const gchar * champlain_map_source_get_license (ChamplainMapSource *map_source); + #endif diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c index 431cbeb..5ef2911 100644 --- a/champlain/champlain-view.c +++ b/champlain/champlain-view.c @@ -790,7 +790,7 @@ update_license (ChamplainView *view) if (priv->show_license) { priv->license_actor = clutter_label_new_with_text ( "sans 8", - ""); //XXX: champlain_map_source_get_license (priv->map_source)); + champlain_map_source_get_license (priv->map_source)); clutter_actor_set_opacity (priv->license_actor, 128); clutter_actor_show (priv->license_actor); -- 2.39.5