From 02fcb53e3a986a85fa8c0248a306132c8996acd8 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Sat, 4 Jun 2011 18:18:32 +0200 Subject: replace-table: Link to defines table instead of copying on creation This allows actual defines to be used without explicit update. Also brings the benefit of placing empty string when define is not defined. --- src/generators.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/generators.c') diff --git a/src/generators.c b/src/generators.c index 4f0963d..1623ad5 100644 --- a/src/generators.c +++ b/src/generators.c @@ -297,9 +297,10 @@ write_html_album (TGallerySetup *setup, res = TRUE; - global_replace_table = replace_table_new_from_defines (theme->defines); - block_parser = block_parser_new (); defines = clone_string_hash_table (theme->defines); + global_replace_table = replace_table_new (); + replace_table_set_defines (global_replace_table, defines); + block_parser = block_parser_new (); block_parser_set_conditionals (block_parser, defines); /* Get number of real pictures in the list */ @@ -463,7 +464,8 @@ write_html_album (TGallerySetup *setup, } /* Generate images (preview, original, thumbnail) */ - local_replace_table = replace_table_new_from_defines (defines); + local_replace_table = replace_table_new (); + replace_table_set_defines (local_replace_table, defines); s1 = NULL; switch (item->type) { @@ -625,9 +627,10 @@ write_html_image (TGallerySetup *setup, preload_imgname = NULL; res = TRUE; - replace_table = replace_table_new_from_defines (theme->defines); - block_parser = block_parser_new (); defines = clone_string_hash_table (theme->defines); + replace_table = replace_table_new (); + replace_table_set_defines (replace_table, defines); + block_parser = block_parser_new (); block_parser_set_conditionals (block_parser, defines); /* Get our index in the album */ -- cgit v1.2.3