1 files changed, 11 insertions, 6 deletions

diff --git a/src/setup.c b/src/setup.c
index b2cd800..7b59030 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -152,7 +152,7 @@ image_sizes_compare_func (TImageSize *a, TImageSize *b)
   sa = a->landscape_width + a->landscape_height + a->portrait_width + a->portrait_height + a->square_size;
   sb = b->landscape_width + b->landscape_height + b->portrait_width + b->portrait_height + b->square_size;
 
-  return sb - sa;
+  return sa - sb;
 }
 
 /*
@@ -218,10 +218,6 @@ parse_design_setup_xml (const gchar *filename)
     }
     g_free (s);
 
-    s = g_strdup_printf ("/design_setup/image_sizes/size[%d]/no_resize", i + 1);
-    image_size->no_resize = xml_file_get_node_present (xml, s);
-    g_free (s);
-
     s = g_strdup_printf ("/design_setup/image_sizes/size[%d]/landscape", i + 1);
     image_size->landscape_width = xml_file_get_node_attribute_long_with_default (xml, s, "w", 0);
     image_size->landscape_height = xml_file_get_node_attribute_long_with_default (xml, s, "h", 0);
@@ -248,6 +244,13 @@ parse_design_setup_xml (const gchar *filename)
     s = g_strdup_printf ("/design_setup/image_sizes/size[%d]/fallback", i + 1);
     image_size->fallback_size = xml_file_get_node_attribute (xml, s, "size");
     g_free (s);
+
+    s = g_strdup_printf ("/design_setup/image_sizes/size[%d]/threshold", i + 1);
+    image_size->no_resize_threshold = xml_file_get_node_attribute_long_with_default (xml, s, "no_resize", DEFAULT_NO_RESIZE_THRESHOLD);
+    image_size->availability_threshold = xml_file_get_node_attribute_long_with_default (xml, s, "availability", DEFAULT_AVAILABILITY_THRESHOLD);
+    image_size->quality_threshold = xml_file_get_node_attribute_long_with_default (xml, s, "quality", DEFAULT_QUALITY_THRESHOLD);
+    g_free (s);
+
   }
   design->image_sizes = g_list_sort (design->image_sizes, (GCompareFunc) image_sizes_compare_func);
 
@@ -368,7 +371,9 @@ makeup_legacy_design (const gchar *filename)
     image_size->portrait_height = xml_file_get_node_attribute_long_with_default (xml, s, "portrait_h", 0);
     image_size->square_size = xml_file_get_node_attribute_long_with_default (xml, s, "square", 0);
     image_size->quality = xml_file_get_node_attribute_long_with_default (xml, s, "quality", -1);
-    image_size->no_resize = (i != 0);
+    image_size->no_resize_threshold = DEFAULT_NO_RESIZE_THRESHOLD;
+    image_size->availability_threshold = DEFAULT_AVAILABILITY_THRESHOLD;
+    image_size->quality_threshold = DEFAULT_QUALITY_THRESHOLD;
     image_size->is_thumbnail = (i == 0);
     image_size->thumb_crop_style = ((i == 0) && squared_thumbs) ? CROP_STYLE_SQUARED : CROP_STYLE_NORMAL;
     g_free (s);