file-roller r2423 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Thu Aug 14 10:47:17 2008
New Revision: 2423
URL: http://svn.gnome.org/viewvc/file-roller?rev=2423&view=rev

Log:
2008-08-14  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-window.c (fr_window_dir_exists_in_archive): handle the case 
	of directories that don't end with a separator. 


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/src/fr-window.c

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Thu Aug 14 10:47:17 2008
@@ -1157,8 +1157,16 @@
 
 	for (i = 0; i < window->archive->command->files->len; i++) {
 		FileData *fdata = g_ptr_array_index (window->archive->command->files, i);
-		if (strncmp (dir_name, fdata->full_path, dir_name_len) == 0)
+
+		if (strncmp (dir_name, fdata->full_path, dir_name_len) == 0) {
 			return TRUE;
+		}
+		else if (fdata->dir
+			 && (fdata->full_path[strlen (fdata->full_path)] != '/')
+			 && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) == 0))
+		{
+			return TRUE;
+		}
 	}
 
 	return FALSE;