[file-roller: 62/123] fixed overwrite check when the files to be extracted are inside a folder

[Paolo Bacchilega <paobac src gnome org>]

commit a1e641aa423b95e7a0b84f7a63bec6efc4fb3257
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Jul 24 09:24:04 2012 +0200

    fixed overwrite check when the files to be extracted are inside a folder

 src/fr-window.c |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/src/fr-window.c b/src/fr-window.c
index f1d6633..ebbd9d8 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -6792,14 +6792,16 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
 	gboolean do_not_extract = FALSE;
 
 	while ((odata->edata->overwrite == FR_OVERWRITE_ASK) && (odata->current_file != NULL)) {
-		char      *path;
-		char      *dest_uri;
-		GFile     *file;
-		GFileInfo *info;
-		GFileType  file_type;
-
-		path = g_uri_escape_string ((char *) odata->current_file->data, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
-		dest_uri = g_strdup_printf ("%s/%s", odata->edata->extract_to_dir, path);
+		const char *base_name;
+		char       *e_base_name;
+		char       *dest_uri;
+		GFile      *file;
+		GFileInfo  *info;
+		GFileType   file_type;
+
+		base_name = _g_path_get_base_name ((char *) odata->current_file->data, odata->edata->base_dir, odata->edata->junk_paths);
+		e_base_name = g_uri_escape_string (base_name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+		dest_uri = g_strdup_printf ("%s/%s", odata->edata->extract_to_dir, e_base_name);
 		file = g_file_new_for_uri (dest_uri);
 		info = g_file_query_info (file,
 					  G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
@@ -6808,7 +6810,7 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
 					  NULL);
 
 		g_free (dest_uri);
-		g_free (path);
+		g_free (e_base_name);
 
 		if (info == NULL) {
 			g_object_unref (file);
@@ -6852,6 +6854,8 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
 
 			return;
 		}
+		else
+			odata->current_file = odata->current_file->next;
 
 		g_object_unref (info);
 		g_object_unref (file);