file-roller r2404 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Wed Aug  6 07:11:05 2008
New Revision: 2404
URL: http://svn.gnome.org/viewvc/file-roller?rev=2404&view=rev

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

	* TODO: updated
	
	* src/fr-command-ar.c: add debian mime type.
	
	Fixes bug #546505 â Debian packages not supported anymore


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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Wed Aug  6 07:11:05 2008
@@ -20,47 +20,9 @@
     This is command dependent: fixed for tar, zip, 7zip, rar.
 
 [ ] #543225 â File-Roller is unable to open gzip-compressed files like pci.ids if they are missing an .gz extension
-
-[x] When creating a multi-volume archive from the main window the new archive
-    is not loaded correctly because the name of the first volume is different
-    from the original name.
-    
+   
 [ ] It's not possible to load, modify, extract remote multi-volume archives.
 
-[?] Implement pipes and redirection to file.  To fix bug #542424.
-
 [?] #501660 â File-roller nautilus extension creates tarbombs
 
-[ ] #503940 â Various Archive Manager documentation mistakes
-
-== Done ==
-
-[x] #504584 â Incorrect comportment when extracting multi part rar files
-
-[x] LP:#186921 â Asking for password with missing archive volume
-
-[x] #521324 â ALZ archive support
-
-[x] #343201 â Use p7zip for RAR archives?
-
-[x] #529395 â file-roller will not open 256 AES zip files
-    --> use 7z for zip archives (see #515194 â PK 4.5 Zip files).
-
-[x] #520844 â File roller not cancelling compression
-
-[x] #519046 â add x-cbr and x-cbz support
-
-[x] implement the tree_view context menu commands.
-
-[x] Add with wildcard.
-	Add with wildcards options :
-	1) Include sub-directories.
-	2) Ignore directories that are symbolic links.
-	3) If the selection is "*" --> ignore backup files.
-
-[x] Drag & Drop.
-
-Other archive formats:
-
-[x]	rar
-[x]	lha
+[x] #503940 â Various Archive Manager documentation mistakes

Modified: trunk/src/fr-command-ar.c
==============================================================================
--- trunk/src/fr-command-ar.c	(original)
+++ trunk/src/fr-command-ar.c	Wed Aug  6 07:11:05 2008
@@ -279,7 +279,9 @@
 }
 
 
-const char *ar_mime_type[] = { "application/x-ar", NULL };
+const char *ar_mime_type[] = { "application/x-ar", 
+			       "application/x-deb",
+			       NULL };
 
 
 const char **
@@ -296,8 +298,12 @@
 	FrCommandCap capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
-	if (is_program_in_path ("ar"))
-		capabilities |= FR_COMMAND_CAN_READ_WRITE;
+	if (is_program_in_path ("ar")) {
+		if (is_mime_type (mime_type, "application/x-deb"))
+			capabilities |= FR_COMMAND_CAN_READ;
+		else if (is_mime_type (mime_type, "application/x-ar"))
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
+	}
 
 	return capabilities;
 }