summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/generators.c13
-rw-r--r--src/setup.c1
-rw-r--r--src/setup.h1
3 files changed, 2 insertions, 13 deletions
diff --git a/src/generators.c b/src/generators.c
index 168c5b0..dbf6667 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -345,6 +345,8 @@ write_html_album (TGallerySetup *setup,
g_free (s2);
g_free (s3);
}
+ if (! parent)
+ g_hash_table_replace (defines, g_strdup ("IS_ROOT"), g_strdup (""));
while (parent) {
s3 = make_string ("../", level);
@@ -433,7 +435,6 @@ write_html_album (TGallerySetup *setup,
block_parser_register_key (block_parser, "IMG_LIST_SQUARED", NULL);
block_parser_register_key (block_parser, "LIST_SEPARATOR", NULL);
block_parser_register_key (block_parser, "LIST_INTERSPACE", NULL);
- block_parser_register_key (block_parser, "GO_UP", "GO_UP");
/* Read through the template and replace placeholders with real data */
@@ -442,16 +443,6 @@ write_html_album (TGallerySetup *setup,
if (line == NULL)
break;
- /* Blocks */
- if (block_parser_has_unused_data (block_parser, "GO_UP")) {
- block = block_parser_get_data (block_parser, "GO_UP");
- if (block) {
- replace_table_process (&block, global_replace_table);
- replace_table_add_key (global_replace_table, "GO_UP", items->parent_index && setup->show_go_up ? block : "");
- }
- g_free (block);
- }
-
if (block_parser_has_unused_data (block_parser, "IMG_LIST")) {
block = g_strdup ("");
diff --git a/src/setup.c b/src/setup.c
index 48e03c5..e88a292 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -116,7 +116,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);
/* 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 7b98634..56f7e84 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -72,7 +72,6 @@ typedef struct {
/* navigation section */
gboolean use_inpage_links;
- gboolean show_go_up;
/* feed section */
gboolean feed_enabled;