Bug fix, added missing variable
This commit is contained in:
parent
60964c9f29
commit
ed14c5b092
@ -187,7 +187,8 @@ static void
|
|||||||
ag_app_open_chart(AgApp *app, GFile *file)
|
ag_app_open_chart(AgApp *app, GFile *file)
|
||||||
{
|
{
|
||||||
GError *err = NULL;
|
GError *err = NULL;
|
||||||
gchar *xml;
|
gchar *uri,
|
||||||
|
*xml;
|
||||||
guint length;
|
guint length;
|
||||||
xmlDocPtr doc;
|
xmlDocPtr doc;
|
||||||
xmlXPathContextPtr xpathCtx;
|
xmlXPathContextPtr xpathCtx;
|
||||||
@ -204,10 +205,13 @@ ag_app_open_chart(AgApp *app, GFile *file)
|
|||||||
*minute,
|
*minute,
|
||||||
*second;
|
*second;
|
||||||
|
|
||||||
|
uri = g_file_get_uri(file);
|
||||||
|
|
||||||
if (!g_file_load_contents(file, NULL, &xml, &length, NULL, &err)) {
|
if (!g_file_load_contents(file, NULL, &xml, &length, NULL, &err)) {
|
||||||
// TODO: Warn with a popup or similar way
|
// TODO: Warn with a popup or similar way
|
||||||
g_warning("Could not open file '%s': %s", uri, err->message);
|
g_warning("Could not open file '%s': %s", uri, err->message);
|
||||||
g_clear_error(&err);
|
g_clear_error(&err);
|
||||||
|
g_free(uri);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -215,6 +219,7 @@ ag_app_open_chart(AgApp *app, GFile *file)
|
|||||||
if ((doc = xmlReadMemory(xml, length, "chart.xml", NULL, 0)) == NULL) {
|
if ((doc = xmlReadMemory(xml, length, "chart.xml", NULL, 0)) == NULL) {
|
||||||
// TODO: Warn with a popup or similar way
|
// TODO: Warn with a popup or similar way
|
||||||
g_warning("Saved chart is corrupt (or not a saved chart at all)");
|
g_warning("Saved chart is corrupt (or not a saved chart at all)");
|
||||||
|
g_free(uri);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -223,6 +228,7 @@ ag_app_open_chart(AgApp *app, GFile *file)
|
|||||||
// TODO: Warn with a popup or similar way
|
// TODO: Warn with a popup or similar way
|
||||||
g_warning("Could not initialize XPath");
|
g_warning("Could not initialize XPath");
|
||||||
xmlFreeDoc(doc);
|
xmlFreeDoc(doc);
|
||||||
|
g_free(uri);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -253,6 +259,7 @@ ag_app_open_chart(AgApp *app, GFile *file)
|
|||||||
g_variant_unref(minute);
|
g_variant_unref(minute);
|
||||||
g_variant_unref(second);
|
g_variant_unref(second);
|
||||||
|
|
||||||
|
g_free(uri);
|
||||||
xmlXPathFreeContext(xpathCtx);
|
xmlXPathFreeContext(xpathCtx);
|
||||||
xmlFreeDoc(doc);
|
xmlFreeDoc(doc);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user