file-roller r2426 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Sat Aug 16 09:41:55 2008
New Revision: 2426
URL: http://svn.gnome.org/viewvc/file-roller?rev=2426&view=rev

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

	* src/fr-archive.c: 
	* src/file-utils.c (make_directory_tree): do not change directory
	permissions when the directory already exists (#547999).


Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/file-utils.c
   trunk/src/fr-archive.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Sat Aug 16 09:41:55 2008
@@ -1,3 +1,7 @@
+== Urgent ==
+
+[ ] #547733 â 7-zip tells about invalid command line
+
 == ToDo ==
 
 [ ] #525274 â File roller seems to be unable to create zipfiles without .zip extension
@@ -19,6 +23,8 @@
 
 [ ] #547312 â file-roller fails to read all files in archive that contains utf-8 files
 
+[ ] #547982 â Failure dialog for file extraction should be more useful
+
 == DONE == 
 
 [x] optimization of the add_folder operation: if the command supports all the

Modified: trunk/src/file-utils.c
==============================================================================
--- trunk/src/file-utils.c	(original)
+++ trunk/src/file-utils.c	Sat Aug 16 09:41:55 2008
@@ -582,7 +582,7 @@
 	gboolean  success = TRUE;
 	GFile    *parent;
 
-	if (dir == NULL)
+	if ((dir == NULL) || g_file_query_exists (dir, NULL))
 		return TRUE;
 
 	parent = g_file_get_parent (dir);

Modified: trunk/src/fr-archive.c
==============================================================================
--- trunk/src/fr-archive.c	(original)
+++ trunk/src/fr-archive.c	Sat Aug 16 09:41:55 2008
@@ -1310,8 +1310,10 @@
 	if ((dest_path == NULL)
 	    || (*dest_path == '\0')
 	    || (strcmp (dest_path, "/") == 0))
+	{
 		return g_strdup (base_dir);
-
+	}
+	
 	dest_dir = g_strdup (dest_path);
 	if (dest_dir[strlen (dest_dir) - 1] == G_DIR_SEPARATOR)
 		dest_dir[strlen (dest_dir) - 1] = 0;