From b960b2a4579bf5cd25124191ff37c5ad30a529ff Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Sat, 4 Jun 2011 18:45:55 +0200 Subject: Port EXIF table visibility switch to the new defines system --- src/generators.c | 9 --------- src/setup.c | 1 - src/setup.h | 1 - 3 files changed, 11 deletions(-) (limited to 'src') diff --git a/src/generators.c b/src/generators.c index c27b2e5..168c5b0 100644 --- a/src/generators.c +++ b/src/generators.c @@ -883,7 +883,6 @@ write_html_image (TGallerySetup *setup, /* Setup block parser */ block_parser_register_key (block_parser, "IMG_FULLSIZE_LINK", "IMG_FULLSIZE_LINK"); - block_parser_register_key (block_parser, "EXIF_TABLE", "EXIF_TABLE"); /* Read through the template and replace placeholders with real data */ @@ -901,14 +900,6 @@ write_html_image (TGallerySetup *setup, } g_free (block); } - if (block_parser_has_unused_data (block_parser, "EXIF_TABLE")) { - block = block_parser_get_data (block_parser, "EXIF_TABLE"); - if (block) { - replace_table_process (&block, replace_table); - replace_table_add_key (replace_table, "EXIF_TABLE", setup->show_exif_table ? block : ""); - } - g_free (block); - } /* Replace all known tags */ replace_table_process (&line, replace_table); diff --git a/src/setup.c b/src/setup.c index 2d7fbac..48e03c5 100644 --- a/src/setup.c +++ b/src/setup.c @@ -117,7 +117,6 @@ parse_setup_xml (const gchar *filename) /* navigation section */ setup->use_inpage_links = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/navigation/use_inpage_links", "value", TRUE); setup->show_go_up = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/navigation/show_go_up", "value", TRUE); - setup->show_exif_table = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/navigation/show_exif_table", "value", TRUE); /* feed section */ setup->feed_enabled = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/feed", "enable", FALSE); diff --git a/src/setup.h b/src/setup.h index 75cbef7..7b98634 100644 --- a/src/setup.h +++ b/src/setup.h @@ -73,7 +73,6 @@ typedef struct { /* navigation section */ gboolean use_inpage_links; gboolean show_go_up; - gboolean show_exif_table; /* feed section */ gboolean feed_enabled; -- cgit v1.2.3