file-roller r2337 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Tue Jun 24 06:42:59 2008
New Revision: 2337
URL: http://svn.gnome.org/viewvc/file-roller?rev=2337&view=rev

Log:
2008-06-24  Paolo Bacchilega  <paobac svn gnome org>

	* TODO: updated.
	
	* src/fr-command-7z.c: set the encrypted flag on for files compressed 
	with an AES method.

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/fr-command-7z.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Tue Jun 24 06:42:59 2008
@@ -10,12 +10,12 @@
 
 [ ] #508737 â can't add file to the archive if archive name is without extension
 
-[ ] #521324 â ALZ archive support
-
 [ ] #482560 â totem-like plugin installer for file-roller
 
 == Done ==
 
+[x] #521324 â ALZ archive support
+
 [x] #343201 â Use p7zip for RAR archives?
 
 [x] #529395 â file-roller will not open 256 AES zip files

Modified: trunk/src/fr-command-7z.c
==============================================================================
--- trunk/src/fr-command-7z.c	(original)
+++ trunk/src/fr-command-7z.c	Tue Jun 24 06:42:59 2008
@@ -165,7 +165,12 @@
 		g_strfreev (modified_fields);
 	}
 	else if (strcmp (fields[0], "Encrypted") == 0) {
-		fdata->encrypted = (strcmp (fields[1], "+") == 0);
+		if (strcmp (fields[1], "+") == 0)
+			fdata->encrypted = TRUE;
+	}
+	else if (strcmp (fields[0], "Method") == 0) {
+		if (strstr (fields[1], "AES") != NULL)
+			fdata->encrypted = TRUE;
 	}
 	else if (strcmp (fields[0], "Attributes") == 0) {
 	}