summaryrefslogtreecommitdiff
path: root/src/generators.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/generators.c')
-rw-r--r--src/generators.c13
1 files changed, 8 insertions, 5 deletions
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 */