diff -Naur file-roller-2.26.1-old/data/file-roller.desktop file-roller-2.26.1/data/file-roller.desktop --- file-roller-2.26.1-old/data/file-roller.desktop 2009-04-14 02:04:07.000000000 +0300 +++ file-roller-2.26.1/data/file-roller.desktop 2009-05-11 21:19:46.434635294 +0300 @@ -271,7 +271,7 @@ Type=Application Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; -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; +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-xz;application/x-xz-compressed-tar;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 diff -Naur file-roller-2.26.1-old/data/file-roller.desktop.in file-roller-2.26.1/data/file-roller.desktop.in --- file-roller-2.26.1-old/data/file-roller.desktop.in 2009-04-14 02:03:49.000000000 +0300 +++ file-roller-2.26.1/data/file-roller.desktop.in 2009-05-11 21:19:34.961632884 +0300 @@ -9,7 +9,7 @@ Type=Application Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; -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; +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-xz;application/x-xz-compressed-tar;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 diff -Naur file-roller-2.26.1-old/data/file-roller.desktop.in.in file-roller-2.26.1/data/file-roller.desktop.in.in --- file-roller-2.26.1-old/data/file-roller.desktop.in.in 2009-04-14 02:00:39.000000000 +0300 +++ file-roller-2.26.1/data/file-roller.desktop.in.in 2009-05-11 21:19:23.693619916 +0300 @@ -9,7 +9,7 @@ Type=Application Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; -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; +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-xz;application/x-xz-compressed-tar;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 diff -Naur file-roller-2.26.1-old/nautilus/nautilus-fileroller.c file-roller-2.26.1/nautilus/nautilus-fileroller.c --- file-roller-2.26.1-old/nautilus/nautilus-fileroller.c 2009-04-14 02:00:38.000000000 +0300 +++ file-roller-2.26.1/nautilus/nautilus-fileroller.c 2009-05-11 21:11:11.047619742 +0300 @@ -179,6 +179,8 @@ "application/x-tarz", "application/x-stuffit", "application/x-war", + "application/x-xz", + "application/x-xz-compressed-tar", "application/x-zip", "application/x-zip-compressed", "application/x-zoo", diff -Naur file-roller-2.26.1-old/src/fr-command-cfile.c file-roller-2.26.1/src/fr-command-cfile.c --- file-roller-2.26.1-old/src/fr-command-cfile.c 2009-04-14 02:00:36.000000000 +0300 +++ file-roller-2.26.1/src/fr-command-cfile.c 2009-05-11 21:10:27.985618983 +0300 @@ -257,6 +257,14 @@ fr_process_end_command (comm->process); compressed_filename = g_strconcat (filename, ".lzma", NULL); } + else if (is_mime_type (comm->mime_type, "application/x-xz")) { + fr_process_begin_command (comm->process, "xz"); + fr_process_set_working_dir (comm->process, temp_dir); + fr_process_add_arg (comm->process, "--"); + fr_process_add_arg (comm->process, filename); + fr_process_end_command (comm->process); + compressed_filename = g_strconcat (filename, ".xz", NULL); + } else if (is_mime_type (comm->mime_type, "application/x-lzop")) { fr_process_begin_command (comm->process, "lzop"); fr_process_set_working_dir (comm->process, temp_dir); @@ -374,6 +382,13 @@ fr_process_add_arg (comm->process, temp_file); fr_process_end_command (comm->process); } + else if (is_mime_type (comm->mime_type, "application/x-xz")) { + fr_process_begin_command (comm->process, "xz"); + fr_process_add_arg (comm->process, "-f"); + fr_process_add_arg (comm->process, "-d"); + fr_process_add_arg (comm->process, temp_file); + fr_process_end_command (comm->process); + } else if (is_mime_type (comm->mime_type, "application/x-lzop")) { fr_process_begin_command (comm->process, "lzop"); fr_process_set_working_dir (comm->process, temp_dir); @@ -431,6 +446,7 @@ "application/x-lzma", "application/x-lzop", "application/x-rzip", + "application/x-xz", NULL }; @@ -466,6 +482,10 @@ if (is_program_in_path ("lzma")) capabilities |= FR_COMMAND_CAN_READ_WRITE; } + else if (is_mime_type (mime_type, "application/x-xz")) { + if (is_program_in_path ("xz")) + capabilities |= FR_COMMAND_CAN_READ_WRITE; + } else if (is_mime_type (mime_type, "application/x-lzop")) { if (is_program_in_path ("lzop")) capabilities |= FR_COMMAND_CAN_READ_WRITE; diff -Naur file-roller-2.26.1-old/src/fr-command-tar.c file-roller-2.26.1/src/fr-command-tar.c --- file-roller-2.26.1-old/src/fr-command-tar.c 2009-04-14 02:00:36.000000000 +0300 +++ file-roller-2.26.1/src/fr-command-tar.c 2009-05-11 21:09:00.329618832 +0300 @@ -205,6 +205,9 @@ } else if (is_mime_type (comm->mime_type, "application/x-lzma-compressed-tar")) fr_process_add_arg (comm->process, "--use-compress-program=lzma"); + + else if (is_mime_type (comm->mime_type, "application/x-xz-compressed-tar")) + fr_process_add_arg (comm->process, "--use-compress-program=xz"); else if (is_mime_type (comm->mime_type, "application/x-lzop-compressed-tar")) fr_process_add_arg (comm->process, "--use-compress-program=lzop"); @@ -551,6 +554,26 @@ new_name = g_strconcat (c_tar->uncomp_filename, ".lzma", NULL); } + else if (is_mime_type (comm->mime_type, "application/x-xz-compressed-tar")) { + fr_process_begin_command (comm->process, "xz"); + fr_process_set_sticky (comm->process, TRUE); + fr_process_set_begin_func (comm->process, begin_func__recompress, comm); + switch (comm->compression) { + case FR_COMPRESSION_VERY_FAST: + fr_process_add_arg (comm->process, "-1"); break; + case FR_COMPRESSION_FAST: + fr_process_add_arg (comm->process, "-3"); break; + case FR_COMPRESSION_NORMAL: + fr_process_add_arg (comm->process, "-6"); break; + case FR_COMPRESSION_MAXIMUM: + fr_process_add_arg (comm->process, "-9"); break; + } + fr_process_add_arg (comm->process, "-f"); + fr_process_add_arg (comm->process, c_tar->uncomp_filename); + fr_process_end_command (comm->process); + + new_name = g_strconcat (c_tar->uncomp_filename, ".xz", NULL); + } else if (is_mime_type (comm->mime_type, "application/x-lzop-compressed-tar")) { fr_process_begin_command (comm->process, "lzop"); fr_process_set_sticky (comm->process, TRUE); @@ -688,6 +711,12 @@ if (file_extension_is (e_filename, ".tar.lzma")) new_name[l - 5] = 0; } + else if (is_mime_type (comm->mime_type, "application/x-xz-compressed-tar")) { + /* X.tar.xz --> X.tar + * (There doesn't seem to be a shorthand suffix) */ + if (file_extension_is (e_filename, ".tar.xz")) + new_name[l - 5] = 0; + } else if (is_mime_type (comm->mime_type, "application/x-lzop-compressed-tar")) { /* X.tzo --> X.tar * X.tar.lzo --> X.tar */ @@ -799,6 +828,14 @@ fr_process_add_arg (comm->process, tmp_name); fr_process_end_command (comm->process); } + else if (is_mime_type (comm->mime_type, "application/x-xz-compressed-tar")) { + fr_process_begin_command (comm->process, "xz"); + fr_process_set_begin_func (comm->process, begin_func__uncompress, comm); + fr_process_add_arg (comm->process, "-f"); + fr_process_add_arg (comm->process, "-d"); + fr_process_add_arg (comm->process, tmp_name); + fr_process_end_command (comm->process); + } else if (is_mime_type (comm->mime_type, "application/x-lzop-compressed-tar")) { fr_process_begin_command (comm->process, "lzop"); fr_process_set_begin_func (comm->process, begin_func__uncompress, comm); @@ -850,6 +887,7 @@ "application/x-lzma-compressed-tar", "application/x-lzop-compressed-tar", "application/x-tarz", + "application/x-xz-compressed-tar", NULL }; @@ -893,6 +931,10 @@ if (is_program_in_path ("lzma")) capabilities |= FR_COMMAND_CAN_READ_WRITE; } + else if (is_mime_type (mime_type, "application/x-xz-compressed-tar")) { + if (is_program_in_path ("xz")) + capabilities |= FR_COMMAND_CAN_READ_WRITE; + } else if (is_mime_type (mime_type, "application/x-lzop-compressed-tar")) { if (is_program_in_path ("lzop")) capabilities |= FR_COMMAND_CAN_READ_WRITE; diff -Naur file-roller-2.26.1-old/src/main.c file-roller-2.26.1/src/main.c --- file-roller-2.26.1-old/src/main.c 2009-04-14 02:00:36.000000000 +0300 +++ file-roller-2.26.1/src/main.c 2009-05-11 21:06:15.104619886 +0300 @@ -112,6 +112,8 @@ { "application/x-tarz", ".tar.Z", N_("Tar compressed with compress (.tar.Z)"), 0 }, { "application/x-stuffit", ".sit", NULL, 0 }, { "application/x-war", ".war", N_("War (.war)"), 0 }, + { "application/x-xz", ".xz", NULL, 0 }, + { "application/x-xz-compressed-tar", ".tar.xz", N_("Tar compressed with xz (.tar.xz)"), 0 }, { "application/x-zoo", ".zoo", N_("Zoo (.zoo)"), 0 }, { "application/zip", ".zip", N_("Zip (.zip)"), 0 }, { NULL, NULL, NULL, 0 } @@ -151,14 +153,17 @@ { ".tar.lzma", "application/x-lzma-compressed-tar" }, { ".tar.lzo", "application/x-lzop-compressed-tar" }, { ".tar.7z", "application/x-7z-compressed-tar" }, + { ".tar.xz", "application/x-xz-compressed-tar" }, { ".tar.Z", "application/x-tarz" }, { ".taz", "application/x-tarz" }, { ".tbz", "application/x-bzip-compressed-tar" }, { ".tbz2", "application/x-bzip-compressed-tar" }, { ".tgz", "application/x-compressed-tar" }, + { ".txz", "application/x-xz-compressed-tar" }, { ".tzma", "application/x-lzma-compressed-tar" }, { ".tzo", "application/x-lzop-compressed-tar" }, { ".war", "application/x-war" }, + { ".xz", "application/x-xz" }, { ".z", "application/x-gzip" }, { ".Z", "application/x-compress" }, { ".zip", "application/zip" },