From f7e4c451b40ee29c7c6fec178da89eeabb8a2a4f Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Sat, 5 Oct 2013 03:23:38 +0200
Subject: [PATCH] Make get_by_xpath() string return value a maybe-string

---
 src/ag-chart.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ag-chart.c b/src/ag-chart.c
index fbf35b3..7bb7c1f 100644
--- a/src/ag-chart.c
+++ b/src/ag-chart.c
@@ -293,7 +293,7 @@ get_by_xpath(xmlXPathContextPtr xpath_context, const gchar *uri, const gchar *xp
 
     switch (type) {
         case XML_CONVERT_STRING:
-            ret = g_variant_new_string(text);
+            ret = g_variant_new("ms", text);
 
             break;
 
@@ -334,9 +334,10 @@ ag_chart_load_from_file(GFile *file, GError **err)
     AgChart            *chart = NULL;
     gchar              *uri;
     gchar              *xml = NULL;
+    gchar              *name;
     gchar              *country_name;
     gchar              *city_name;
-    guint              length;
+    gsize              length;
     xmlDocPtr          doc;
     xmlXPathContextPtr xpath_context;
     GVariant           *chart_name;
@@ -477,8 +478,10 @@ ag_chart_load_from_file(GFile *file, GError **err)
     g_variant_unref(latitude);
     g_variant_unref(altitude);
 
-    ag_chart_set_name(chart, g_variant_get_string(chart_name, NULL));
+    g_variant_get(chart_name, "ms", &name);
     g_variant_unref(chart_name);
+    ag_chart_set_name(chart, name);
+    g_free(name);
 
     g_variant_get(country, "ms", &country_name);
     g_variant_unref(country);