file-roller r2289 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Mon Jun  2 16:04:29 2008
New Revision: 2289
URL: http://svn.gnome.org/viewvc/file-roller?rev=2289&view=rev

Log:
2008-06-02  Paolo Bacchilega  <paobac svn gnome org>
	
	* src/fr-command-rpm.c (list__process_line): 
	
	Fixed bug #536055 â Support for special characters in rpm archives
	Patch by Eric Piel

	* src/main.c (register_commands): added FR_COMMAND_CAP_ARCHIVE_MANY_FILES
	where appropriate

Modified:
   trunk/ChangeLog
   trunk/src/fr-command-rpm.c
   trunk/src/main.c

Modified: trunk/src/fr-command-rpm.c
==============================================================================
--- trunk/src/fr-command-rpm.c	(original)
+++ trunk/src/fr-command-rpm.c	Mon Jun  2 16:04:29 2008
@@ -124,15 +124,21 @@
 	}
 
 	if (*(fields[0]) == '/') {
-		fdata->full_path = g_strdup (fields[0]);
+		fdata->full_path = g_strcompress (fields[0]);
 		fdata->original_path = fdata->full_path;
-	} else {
-		fdata->full_path = g_strconcat ("/", fields[0], NULL);
+	} 
+	else {
+		char *compressed;
+		
+		compressed = g_strcompress (fields[0]);
+		fdata->full_path = g_strconcat ("/", compressed, NULL);
+		g_free (compressed);
+		
 		fdata->original_path = fdata->full_path + 1;
 	}
 
 	if (fields[1] != NULL)
-		fdata->link = g_strdup (fields[1]);
+		fdata->link = g_strcompress (fields[1]);
 	g_strfreev (fields);
 
 	fdata->name = g_strdup (file_name_from_path (fdata->full_path));

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Mon Jun  2 16:04:29 2008
@@ -553,11 +553,11 @@
 			  "application/x-7z-compressed", FR_COMMAND_CAP_ALL,
 			  NULL);	
 	register_command (FR_TYPE_COMMAND_ACE, 
-			  "application/x-ace", FR_COMMAND_CAP_READ_WRITE,
+			  "application/x-ace", FR_COMMAND_CAP_READ_WRITE | FR_COMMAND_CAP_ARCHIVE_MANY_FILES,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_AR, 
 			  "application/x-ar", FR_COMMAND_CAP_ALL,
-			  "application/x-deb", FR_COMMAND_CAP_READ,
+			  "application/x-deb", FR_COMMAND_CAP_READ | FR_COMMAND_CAP_ARCHIVE_MANY_FILES,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_ARJ, 
 			  "application/x-arj", FR_COMMAND_CAP_ALL,
@@ -573,7 +573,7 @@
 			  "application/x-cpio", FR_COMMAND_CAP_ALL,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_ISO, 
-			  "application/x-cd-image", FR_COMMAND_CAP_READ,
+			  "application/x-cd-image", FR_COMMAND_CAP_READ | FR_COMMAND_CAP_ARCHIVE_MANY_FILES,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_JAR,
 			  "application/x-jar", FR_COMMAND_CAP_ALL,
@@ -585,7 +585,7 @@
 			  "application/x-rar", FR_COMMAND_CAP_ALL,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_RPM,
-			  "application/x-rpm", FR_COMMAND_CAP_ALL,
+			  "application/x-rpm", FR_COMMAND_CAP_READ | FR_COMMAND_CAP_ARCHIVE_MANY_FILES,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_TAR, 
 			  "application/x-tar", FR_COMMAND_CAP_ALL,
@@ -595,7 +595,7 @@
 			  "application/x-lzop-compressed-tar", FR_COMMAND_CAP_ALL,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_UNSTUFF,
-			  "application/x-stuffit", FR_COMMAND_CAP_READ,
+			  "application/x-stuffit", FR_COMMAND_CAP_READ | FR_COMMAND_CAP_ARCHIVE_MANY_FILES,
 			  NULL);
 	register_command (FR_TYPE_COMMAND_ZIP,
 			  "application/zip", FR_COMMAND_CAP_ALL,