file-roller r2413 - in trunk: . data nautilus src

[paobac svn gnome org]

Author: paobac
Date: Sat Aug  9 06:45:40 2008
New Revision: 2413
URL: http://svn.gnome.org/viewvc/file-roller?rev=2413&view=rev

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

	* src/main.c: 
	* src/fr-command-zip.c: 
	* src/fr-command-7z.c: 
	* nautilus/nautilus-fileroller.c: 
	* data/file-roller.desktop.in.in: 
	
	use application/x-ms-dos-executable for MS-DOS executables.
	

Modified:
   trunk/ChangeLog
   trunk/data/file-roller.desktop.in.in
   trunk/nautilus/nautilus-fileroller.c
   trunk/src/fr-command-7z.c
   trunk/src/fr-command-zip.c
   trunk/src/main.c

Modified: trunk/data/file-roller.desktop.in.in
==============================================================================
--- trunk/data/file-roller.desktop.in.in	(original)
+++ trunk/data/file-roller.desktop.in.in	Sat Aug  9 06:45:40 2008
@@ -9,7 +9,7 @@
 Type=Application
 Icon=file-roller
 Categories=GTK;GNOME;Utility;
-MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;multipart/x-zip;
+MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;multipart/x-zip;
 X-GNOME-DocPath=file-roller/file-roller.xml
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=file-roller

Modified: trunk/nautilus/nautilus-fileroller.c
==============================================================================
--- trunk/nautilus/nautilus-fileroller.c	(original)
+++ trunk/nautilus/nautilus-fileroller.c	Sat Aug  9 06:45:40 2008
@@ -160,7 +160,7 @@
 	"application/x-cpio",
 	"application/x-deb",
 	"application/x-ear",
-	"application/x-executable",
+	"application/x-ms-dos-executable",
 	"application/x-gtar",
 	"application/x-gzip",
 	"application/x-gzpostscript",

Modified: trunk/src/fr-command-7z.c
==============================================================================
--- trunk/src/fr-command-7z.c	(original)
+++ trunk/src/fr-command-7z.c	Sat Aug  9 06:45:40 2008
@@ -335,7 +335,7 @@
 		fr_process_add_arg (comm->process, "-mx=7"); break;
 	}
 
-	if (is_mime_type (comm->mime_type, "application/x-executable"))
+	if (is_mime_type (comm->mime_type, "application/x-ms-dos-executable"))
 		fr_process_add_arg (comm->process, "-sfx");
 
 	if (comm->volume_size > 0)
@@ -365,7 +365,7 @@
 	fr_process_add_arg (comm->process, "d");
 	fr_process_add_arg (comm->process, "-bd");
 	fr_process_add_arg (comm->process, "-y");
-	if (is_mime_type (comm->mime_type, "application/x-executable"))
+	if (is_mime_type (comm->mime_type, "application/x-ms-dos-executable"))
 		fr_process_add_arg (comm->process, "-sfx");
 
 	if (from_file != NULL)
@@ -481,7 +481,7 @@
 				    "application/x-cd-image",
 				    /*"application/x-cbr",*/
 				    "application/x-cbz",
-				    "application/x-executable",
+				    "application/x-ms-dos-executable",
 				    "application/x-rar",
 				    "application/zip",
 				    NULL };
@@ -510,7 +510,7 @@
 	else if (is_program_in_path ("7z")) {
 		capabilities |= FR_COMMAND_CAN_READ;
 		if (is_mime_type (mime_type, "application/x-cbz")
-		    || is_mime_type (mime_type, "application/x-executable")
+		    || is_mime_type (mime_type, "application/x-ms-dos-executable")
 		    || is_mime_type (mime_type, "application/zip"))
 		{
 			capabilities |= FR_COMMAND_CAN_WRITE | FR_COMMAND_CAN_ENCRYPT;

Modified: trunk/src/fr-command-zip.c
==============================================================================
--- trunk/src/fr-command-zip.c	(original)
+++ trunk/src/fr-command-zip.c	Sat Aug  9 06:45:40 2008
@@ -357,7 +357,7 @@
 
 
 const char *zip_mime_type[] = { "application/x-cbz",
-				"application/x-executable",
+				"application/x-ms-dos-executable",
 				"application/zip",
 				NULL };
 
@@ -377,7 +377,7 @@
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT;
 	if (is_program_in_path ("zip")) {
-		if (strcmp (mime_type, "application/x-executable") == 0)
+		if (strcmp (mime_type, "application/x-ms-dos-executable") == 0)
 			capabilities |= FR_COMMAND_CAN_READ;
 		else
 			capabilities |= FR_COMMAND_CAN_READ_WRITE;

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Sat Aug  9 06:45:40 2008
@@ -101,7 +101,7 @@
 	{ "application/x-cpio",                 ".cpio",     NULL, 0 },
 	{ "application/x-deb",                  ".deb",      NULL, 0 },
 	{ "application/x-ear",                  ".ear",      N_("Ear (.ear)"), 0 },
-	{ "application/x-executable",           ".exe",      N_("Self-extracting zip (.exe)"), 0 },
+	{ "application/x-ms-dos-executable",    ".exe",      N_("Self-extracting zip (.exe)"), 0 },
 	{ "application/x-gzip",                 ".gz",       NULL, 0 },
 	{ "application/x-java-archive",         ".jar",      N_("Jar (.jar)"), 0 },
 	{ "application/x-lha",                  ".lzh",      N_("Lha (.lzh)"), 0 },
@@ -136,7 +136,7 @@
 	{ ".cpio", "application/x-cpio" },
 	{ ".deb", "application/x-deb" },
 	{ ".ear", "application/x-ear" },
-	{ ".exe", "application/x-executable" },
+	{ ".exe", "application/x-ms-dos-executable" },
 	{ ".gz", "application/x-gzip" },
 	{ ".iso", "application/x-cd-image" },
 	{ ".jar", "application/x-java-archive" },
@@ -515,12 +515,9 @@
 register_commands (void)
 {
 	/* The order here is important. Commands registered earlier have higher
-	 * priority; for example zip archives will be opened using 7Z instead
-	 * of ZIP.  However commands that can read and write a file format
+	 * priority.  However commands that can read and write a file format
 	 * have higher priority over commands that can only read the same
-	 * format, regardless of the registration order; for example rar
-	 * archives will be opened with 7Z only if the rar utility is not
-	 * installed because 7z cannot modify rar archives. */
+	 * format, regardless of the registration order. */
 
 	register_command (FR_TYPE_COMMAND_TAR);
 	register_command (FR_TYPE_COMMAND_CFILE);