gthumb r2365 - in branches/gthumb-2-10: . src

[mjc svn gnome org]

Author: mjc
Date: Thu Jul 31 16:20:49 2008
New Revision: 2365
URL: http://svn.gnome.org/viewvc/gthumb?rev=2365&view=rev

Log:
2008-07-31  Michael J. Chudobiak  <mjc svn gnome org>

        * NEWS:
        * src/catalog-web-exporter.c: (gth_parsed_doc_print):
        Fix for Bug #544893: Crash in web album <gthumb:if/>.
        Patch by Christophe Bisiere.



Modified:
   branches/gthumb-2-10/ChangeLog
   branches/gthumb-2-10/NEWS
   branches/gthumb-2-10/src/catalog-web-exporter.c

Modified: branches/gthumb-2-10/NEWS
==============================================================================
--- branches/gthumb-2-10/NEWS	(original)
+++ branches/gthumb-2-10/NEWS	Thu Jul 31 16:20:49 2008
@@ -10,6 +10,7 @@
 	* Fixed bug #512374 - array accessed past end.
 	* Fixed bug #543584 - fix build with libgphoto2 2.4.2
 	* Fixed bug #543771 - Segfault when hitting "Remove comment"
+	* Fixed bug #544893 - Crash in web album <gthumb:if/>
 
 version 2.10.8
 --------------

Modified: branches/gthumb-2-10/src/catalog-web-exporter.c
==============================================================================
--- branches/gthumb-2-10/src/catalog-web-exporter.c	(original)
+++ branches/gthumb-2-10/src/catalog-web-exporter.c	Thu Jul 31 16:20:49 2008
@@ -1582,6 +1582,9 @@
 			break;
 
 		case GTH_TAG_IF:
+			idx = MIN (ce->image, ce->n_images - 1);
+			idata = g_list_nth (ce->file_list, idx)->data;
+			ce->eval_image = idata;
 			for (scan = tag->value.cond_list; scan; scan = scan->next) {
 				GthCondition *cond = scan->data;
 				if (expression_value (ce, cond->expr) != 0) {