diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2010-06-29 00:01:14 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2010-06-29 00:01:14 +0200 |
| commit | d9dd375a6d6090274fde3d57b30788195f48755a (patch) | |
| tree | 30c33d539659afb355c361c898d414817c0e2b72 | |
| parent | 3387994ab268c6631cff12fff359094623dd4a68 (diff) | |
| download | cataract-d9dd375a6d6090274fde3d57b30788195f48755a.tar.xz | |
Fix counting of hidden albums
| -rw-r--r-- | src/generators.c | 2 | ||||
| -rw-r--r-- | src/items.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/generators.c b/src/generators.c index b2cf807..8db260f 100644 --- a/src/generators.c +++ b/src/generators.c @@ -296,7 +296,7 @@ write_html_album (TGallerySetup *setup, real_total_items = 0; for (i = 0; i < items->items->len; i++) { tmp_item = g_ptr_array_index (items->items, i); - if (tmp_item->type == INDEX_ITEM_TYPE_PICTURE) + if (tmp_item->type == INDEX_ITEM_TYPE_PICTURE && (! tmp_item->hidden)) real_total_items++; } replace_table_add_key_int (global_replace_table, "TOTAL_ITEMS", real_total_items); diff --git a/src/items.c b/src/items.c index 83c5368..730908e 100644 --- a/src/items.c +++ b/src/items.c @@ -267,15 +267,17 @@ int get_album_objects_count (const gchar *filename) { TXMLFile *xml; - int count; + int count, hidden; xml = xml_parser_load (filename); if (xml == NULL) return 0; count = xml_file_node_get_children_count (xml, "/gallery/items/item"); + hidden = xml_file_node_get_children_count (xml, "/gallery/items/item/hidden"); + xml_parser_close (xml); - return count; + return (count - hidden); } /* |