[libchamplain] champlain-map-source-factory: Fix memory leak in map source constructors

[Jiří Techet <jiritechet src gnome org>]

commit 779fa48b5f785c980c9ad2e873e1d06761836d23
Author: Marius Stanciu <stanciumarius94 gmail com>
Date:   Sat Apr 9 21:49:06 2016 +0300

    champlain-map-source-factory: Fix memory leak in map source constructors
    
    https://bugzilla.gnome.org/show_bug.cgi?id=764692

 champlain/champlain-map-source-factory.c |   43 ++++++++++++++----------------
 1 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 3ffcba3..9a53b76 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -571,21 +571,19 @@ champlain_map_source_new_generic (ChamplainMapSourceDesc *desc)
 {
   ChamplainMapSource *map_source;
   ChamplainRenderer *renderer;
-  gchar *id, *name, *license, *license_uri, *uri_format;
+  const gchar *id, *name, *license, *license_uri, *uri_format;
   guint min_zoom, max_zoom, tile_size;
   ChamplainMapProjection projection;
 
-  g_object_get (G_OBJECT (desc),
-      "id", &id,
-      "name", &name,
-      "license", &license,
-      "license-uri", &license_uri,
-      "min-zoom-level", &min_zoom,
-      "max-zoom-level", &max_zoom,
-      "tile-size", &tile_size,
-      "projection", &projection,
-      "uri-format", &uri_format,
-      NULL);
+  id = champlain_map_source_desc_get_id (desc);
+  name = champlain_map_source_desc_get_name (desc);
+  license = champlain_map_source_desc_get_license (desc);
+  license_uri = champlain_map_source_desc_get_license_uri (desc);
+  min_zoom = champlain_map_source_desc_get_min_zoom_level (desc);
+  max_zoom = champlain_map_source_desc_get_max_zoom_level (desc);
+  tile_size = champlain_map_source_desc_get_tile_size (desc);
+  projection = champlain_map_source_desc_get_projection (desc);
+  uri_format = champlain_map_source_desc_get_uri_format (desc);
 
   renderer = CHAMPLAIN_RENDERER (champlain_image_renderer_new ());
 
@@ -611,20 +609,19 @@ champlain_map_source_new_memphis (ChamplainMapSourceDesc *desc)
 {
   ChamplainMapSource *map_source;
   ChamplainRenderer *renderer;
-  gchar *id, *name, *license, *license_uri;
+  const gchar *id, *name, *license, *license_uri;
   guint min_zoom, max_zoom, tile_size;
   ChamplainMapProjection projection;
 
-  g_object_get (G_OBJECT (desc),
-      "id", &id,
-      "name", &name,
-      "license", &license,
-      "license-uri", &license_uri,
-      "min-zoom-level", &min_zoom,
-      "max-zoom-level", &max_zoom,
-      "tile-size", &tile_size,
-      "projection", &projection,
-      NULL);
+  id = champlain_map_source_desc_get_id (desc);
+  name = champlain_map_source_desc_get_name (desc);
+  license = champlain_map_source_desc_get_license (desc);
+  license_uri = champlain_map_source_desc_get_license_uri (desc);
+  min_zoom = champlain_map_source_desc_get_min_zoom_level (desc);
+  max_zoom = champlain_map_source_desc_get_max_zoom_level (desc);
+  tile_size = champlain_map_source_desc_get_tile_size (desc);
+  projection = champlain_map_source_desc_get_projection (desc);
+  uri_format = champlain_map_source_desc_get_uri_format (desc);
 
   renderer = CHAMPLAIN_RENDERER (champlain_memphis_renderer_new_full (tile_size));