[file-roller: 4/4] Merge branch 'friemann/file-roller-fix-tar-lzo'

[Paolo Bacchilega <paobac src gnome org>]

commit da2a3ae0498c34a7a427007d2e823eae2f44d081
Merge: be5c0fd8 d6f99ee6
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Oct 12 18:04:20 2019 +0200

    Merge branch 'friemann/file-roller-fix-tar-lzo'

 data/supported-mime-types      |  2 +-
 nautilus/nautilus-fileroller.c |  2 +-
 src/fr-archive-libarchive.c    |  4 ++--
 src/fr-command-tar.c           | 14 +++++++-------
 src/fr-init.c                  |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)
---
diff --cc data/supported-mime-types
index 691bde78,3880f5ff..eae23630
--- a/data/supported-mime-types
+++ b/data/supported-mime-types
@@@ -50,9 -49,9 +49,10 @@@ application/x-rzip
  application/x-rzip-compressed-tar;
  application/x-tar;
  application/x-tarz;
+ application/x-tzo;
  application/x-stuffit;
  application/x-war;
 +application/x-xar;
  application/x-xz;
  application/x-xz-compressed-tar;
  application/x-zip;
diff --cc nautilus/nautilus-fileroller.c
index 9de364a8,b9d6817e..05b33e8b
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@@ -134,10 -133,9 +133,11 @@@ static struct 
                { "application/x-rpm", TRUE },
                { "application/x-rzip", TRUE },
                { "application/x-stuffit", TRUE },
+               { "application/x-tzo", TRUE },
                { "application/x-war", TRUE },
                { "application/x-zoo", TRUE },
 +              { "application/x-zstd-compressed-tar", TRUE },
 +              { "application/zstd", TRUE },
                { "multipart/x-zip", TRUE },
                { NULL, FALSE }
  };
diff --cc src/fr-archive-libarchive.c
index 719832a0,b1048f2d..3a6153d5
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@@ -88,11 -87,9 +87,12 @@@ const char *libarchiver_mime_types[] = 
        "application/x-rpm",
        "application/x-tar",
        "application/x-tarz",
+       "application/x-tzo",
        "application/x-xar",
        "application/x-xz-compressed-tar",
 +#if (ARCHIVE_VERSION_NUMBER >= 3003003)
 +      "application/x-zstd-compressed-tar",
 +#endif
        "application/zip",
        NULL
  };
diff --cc src/fr-command-tar.c
index d3f59c00,2922f6bf..889c4fa0
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@@ -229,12 -229,9 +229,12 @@@ add_compress_arg (FrCommand *comm
        else if (_g_mime_type_matches (archive->mime_type, "application/x-xz-compressed-tar"))
                fr_process_add_arg (comm->process, "--use-compress-program=xz");
  
-       else if (_g_mime_type_matches (archive->mime_type, "application/x-lzop-compressed-tar"))
+       else if (_g_mime_type_matches (archive->mime_type, "application/x-tzo"))
                fr_process_add_arg (comm->process, "--use-compress-program=lzop");
  
 +      else if (_g_mime_type_matches (archive->mime_type, "application/x-zstd-compressed-tar"))
 +              fr_process_add_arg (comm->process, "--use-compress-program=zstd");
 +
        else if (_g_mime_type_matches (archive->mime_type, "application/x-7z-compressed-tar")) {
                FrCommandTar *comm_tar = (FrCommandTar*) comm;
                char         *option;
@@@ -1167,11 -1123,10 +1167,11 @@@ const char *tar_mime_types[] = { "appli
                                 "application/x-lz4-compressed-tar",
                                 "application/x-lzip-compressed-tar",
                                 "application/x-lzma-compressed-tar",
-                                "application/x-lzop-compressed-tar",
                                 "application/x-rzip-compressed-tar",
                                 "application/x-tarz",
+                                "application/x-tzo",
                                 "application/x-xz-compressed-tar",
 +                               "application/x-zstd-compressed-tar",
                                 NULL };
  
  
diff --cc src/fr-init.c
index b13680fc,5fdd44e0..e7f54ab4
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@@ -183,8 -180,7 +183,8 @@@ FrExtensionType file_ext_type[] = 
        { ".tlz", "application/x-lzip-compressed-tar" },
        { ".tlz4", "application/x-lz4-compressed-tar" },
        { ".tzma", "application/x-lzma-compressed-tar" },
-       { ".tzo", "application/x-lzop-compressed-tar" },
+       { ".tzo", "application/x-tzo" },
 +      { ".tzst", "application/x-zstd-compressed-tar" },
        { ".war", "application/x-war" },
        { ".wim", "application/x-ms-wim" },
        { ".xar", "application/x-xar" },