Fix regression introduced when ChamplainMapSource was introduced

diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index 9850b9539e578da0088d64a4d2c372d3972aa51f..1359daa422694f7cd4817dd373e300cf155c60f9 100644 (file)
--- 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 bcea848149557a7b0db63aff8620ae95a97d14d3..796d5a34887982dc5a4c6ce7770310659abcad80 100644 (file)
--- 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 431cbeb9b3568e96687880a081907e8a83786922..5ef29117fe1d48fcf90abbcbcfcc74c2c7b3cf32 100644 (file)
--- 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);