[Xfce4-commits] r25952 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2007-08-02 07:31:28 +0000 (Thu, 02 Aug 2007)
New Revision: 25952

Modified:
   xarchiver/trunk/src/archive.c
   xarchiver/trunk/src/zip.c
Log:
Fixed wrong count of the numbers of dirs inside the archive.


Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c	2007-08-02 07:17:51 UTC (rev 25951)
+++ xarchiver/trunk/src/archive.c	2007-08-02 07:31:28 UTC (rev 25952)
@@ -374,6 +374,7 @@
 			last_entry->columns = xa_fill_archive_entry_columns_for_each_row(archive,last_entry,items);
 			last_entry->is_dir = TRUE;
 			archive->entries = g_slist_prepend (archive->entries,last_entry);
+			archive->nr_of_dirs++;
 		}
 		p++;
 		g_free(full_path_name);
@@ -390,6 +391,7 @@
 
 				child_entry->next = last_entry->child;
 				last_entry->child = child_entry;
+				archive->nr_of_dirs++;
 			}
 			g_free(full_path_name);
 			last_entry = child_entry;

Modified: xarchiver/trunk/src/zip.c
===================================================================
--- xarchiver/trunk/src/zip.c	2007-08-02 07:17:51 UTC (rev 25951)
+++ xarchiver/trunk/src/zip.c	2007-08-02 07:31:28 UTC (rev 25952)
@@ -78,10 +78,7 @@
 	line[n]='\0';
 	item[i] = line + a;
 	if ( (line+a)[0] == 'd')
-	{
 		dir = TRUE;
-		archive->nr_of_dirs++;
-	}
 	else
 		archive->nr_of_files++;
 	i++;