From 050e064c40dafe1e90307870e02ad29815fe9f74 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 18 Mar 2014 12:23:18 +0100 Subject: Use "override" terminology instead of "fake" This is a file format break within development branch. --- src/items.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/items.c') diff --git a/src/items.c b/src/items.c index b3f1fac..2434c77 100644 --- a/src/items.c +++ b/src/items.c @@ -177,14 +177,14 @@ parse_album_xml (const gchar *filename, TPathInfo *path_info) g_free (s); } - index->metadata_fake_datetime = (time_t) -1; - s = xml_file_get_node_attribute (xml, "/gallery/general/metadata/fake", "date"); + index->metadata_override_datetime = (time_t) -1; + s = xml_file_get_node_attribute (xml, "/gallery/general/metadata/override", "date"); if (s != NULL) { - index->metadata_fake_datetime = parse_datetime_string (s); + index->metadata_override_datetime = parse_datetime_string (s); g_free (s); } - index->metadata_fake_aperture = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/fake", "aperture", -1); - index->metadata_fake_focal_length = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/fake", "focal_length", -1); + index->metadata_override_aperture = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/override", "aperture", -1); + index->metadata_override_focal_length = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/override", "focal_length", -1); /* TODO: add support for lens name */ s = xml_file_get_node_attribute (xml, "/gallery/general/thumbnail", "crop"); @@ -329,15 +329,15 @@ parse_album_xml (const gchar *filename, TPathInfo *path_info) g_free (s2); } - item->metadata_fake_datetime = (time_t) -1; - s = g_strdup_printf ("/gallery/items/*[%d]/metadata/fake", i + 1); + item->metadata_override_datetime = (time_t) -1; + s = g_strdup_printf ("/gallery/items/*[%d]/metadata/override", i + 1); s2 = xml_file_get_node_attribute (xml, s, "date"); if (s2 != NULL) { - item->metadata_fake_datetime = parse_datetime_string (s2); + item->metadata_override_datetime = parse_datetime_string (s2); g_free (s2); } - item->metadata_fake_aperture = xml_file_get_node_attribute_double (xml, s, "aperture", -1); - item->metadata_fake_focal_length = xml_file_get_node_attribute_double (xml, s, "focal_length", -1); + item->metadata_override_aperture = xml_file_get_node_attribute_double (xml, s, "aperture", -1); + item->metadata_override_focal_length = xml_file_get_node_attribute_double (xml, s, "focal_length", -1); /* TODO: add support for lens name */ g_free (s); -- cgit v1.2.3