3 files changed, 2 insertions, 8 deletions
diff --git a/src/generators.c b/src/generators.c
index 1623ad5..c27b2e5 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -812,11 +812,8 @@ write_html_image (TGallerySetup *setup,
   s1 = item->border_style;
   if (s1 == NULL)
     s1 = parent_items->border_style;
-  if (s1 == NULL)
-    s1 = setup->border_style;
-  if (s1 == NULL)
-    s1 = "border_single";
-  replace_table_add_key (replace_table, "IMG_BORDER_STYLE", s1);
+  if (s1)
+    g_hash_table_replace (defines, g_strdup ("BORDER_STYLE"), g_strdup (s1));
 
   /*  Next/Previous links  */
   if (next_item) {
diff --git a/src/setup.c b/src/setup.c
index 3a2a66d..2d7fbac 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -91,7 +91,6 @@ parse_setup_xml (const gchar *filename)
   setup->supplemental_files_use_common_root = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/design/supplemental_files_use_common_root", "value", FALSE);
 
   /*  images section  */
-  setup->border_style = xml_file_get_node_attribute (xml, "/gallery_setup/images/border", "style");
   setup->preload = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/images/preload", "value", TRUE);
   setup->use_iptc_exif = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/images/use_iptc_exif", "value", FALSE);
   setup->erase_exif_thumbnail = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/images/erase_embed_thumbnail", "value", FALSE);
@@ -371,7 +370,6 @@ free_setup_data (TGallerySetup *setup)
   if (setup) {
     g_free (setup->setup_xml_path);
     g_free (setup->design_setup_file);
-    g_free (setup->border_style);
     g_free (setup->meta_author);
     g_free (setup->meta_author_email);
     g_free (setup->meta_description);
diff --git a/src/setup.h b/src/setup.h
index a96a73f..75cbef7 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -53,7 +53,6 @@ typedef struct {
   gboolean supplemental_files_use_common_root;
 
   /*  images section  */
-  gchar *border_style;
   gboolean preload;
   gboolean use_iptc_exif;
   gboolean erase_exif_thumbnail;