From 7fc700bf4e8e06136a123f972324a5c7ea656f00 Mon Sep 17 00:00:00 2001 From: "Gergely POLONKAI (W00d5t0ck)" Date: Sat, 21 Sep 2013 15:50:16 +0200 Subject: [PATCH] Made country and city values optional in save files The and tags are still required, but may be empty --- src/ag-chart.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ag-chart.c b/src/ag-chart.c index 3ad9f38..9d8136b 100644 --- a/src/ag-chart.c +++ b/src/ag-chart.c @@ -326,7 +326,9 @@ ag_chart_load_from_file(GFile *file, GError **err) { AgChart *chart = NULL; gchar *uri, - *xml = NULL; + *xml = NULL, + *country_name, + *city_name; guint length; xmlDocPtr doc; xmlXPathContextPtr xpath_context; @@ -471,11 +473,15 @@ ag_chart_load_from_file(GFile *file, GError **err) ag_chart_set_name(chart, g_variant_get_string(chart_name, NULL)); g_variant_unref(chart_name); - ag_chart_set_country(chart, g_variant_get_string(country, NULL)); + g_variant_get(country, "ms", &country_name); g_variant_unref(country); + ag_chart_set_country(chart, country_name); + g_free(country_name); - ag_chart_set_city(chart, g_variant_get_string(city, NULL)); + g_variant_get(city, "ms", &city_name); g_variant_unref(city); + ag_chart_set_city(chart, city_name); + g_free(city_name); g_free(xml); g_free(uri);