User customizable image directories

1 files changed, 16 insertions, 0 deletions

diff --git a/src/setup.c b/src/setup.c
index 145a5f2..d07e6ab 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -104,6 +104,16 @@ parse_setup_xml (const char *filename, TGallerySetup *setup)
   if (setup->index_file_name == NULL || strlen (setup->index_file_name) == 0)
     setup->index_file_name = strdup (DEFAULT_INDEX_FILENAME);
 
+  setup->thumbnail_dir = xml_file_get_node_value (xml, "/gallery_setup/images/thumbnail_dir/text()");
+  if (setup->thumbnail_dir == NULL || strlen (setup->thumbnail_dir) == 0)
+    setup->thumbnail_dir = strdup (DEFAULT_THUMBNAIL_DIR);
+  setup->img_big_dir = xml_file_get_node_value (xml, "/gallery_setup/images/preview_dir/text()");
+  if (setup->img_big_dir == NULL || strlen (setup->img_big_dir) == 0)
+    setup->img_big_dir = strdup (DEFAULT_IMG_BIG_DIR);
+  setup->img_orig_dir = xml_file_get_node_value (xml, "/gallery_setup/images/original_dir/text()");
+  if (setup->img_orig_dir == NULL || strlen (setup->img_orig_dir) == 0)
+    setup->img_orig_dir = strdup (DEFAULT_IMG_ORIG_DIR);
+
 
   setup->thumbnail_landscape_width = xml_file_get_node_attribute_long (xml, "/gallery_setup/images/thumbnail", "landscape_w", 0);
   setup->thumbnail_landscape_height = xml_file_get_node_attribute_long (xml, "/gallery_setup/images/thumbnail", "landscape_h", 0);
@@ -277,6 +287,12 @@ free_setup_data (TGallerySetup *setup)
         free (setup->favicon_file);
     if (setup->favicon_type)
         free (setup->favicon_type);
+    if (setup->thumbnail_dir)
+        free (setup->thumbnail_dir);
+    if (setup->img_big_dir)
+        free (setup->img_big_dir);
+    if (setup->img_orig_dir)
+        free (setup->img_orig_dir);
     free (setup);
     setup = NULL;
   }