[file-roller] added support for the official debian package mime type
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] added support for the official debian package mime type
- Date: Sun, 13 Dec 2015 10:05:06 +0000 (UTC)
commit 470dff1fca124f5bec510ab93cd35acbce3ce851
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Dec 13 10:58:20 2015 +0100
added support for the official debian package mime type
nautilus/nautilus-fileroller.c | 1 +
src/fr-archive-libarchive.c | 2 ++
src/fr-command-ar.c | 8 ++++++--
src/fr-command-dpkg.c | 4 +++-
src/fr-init.c | 2 ++
5 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
index 7453d08..0cdaecb 100644
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@ -164,6 +164,7 @@ static struct {
{ "application/x-compressed-tar", TRUE },
{ "application/x-cpio", TRUE },
{ "application/x-deb", TRUE },
+ { "application/vnd.debian.binary-package", TRUE },
{ "application/x-ear", TRUE },
{ "application/x-ms-dos-executable", FALSE },
{ "application/x-gtar", FALSE },
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
index 89258de..9e84475 100644
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@ -67,6 +67,7 @@ fr_archive_libarchive_finalize (GObject *object)
const char *libarchiver_mime_types[] = {
+ "application/vnd.debian.binary-package",
"application/vnd.ms-cab-compressed",
"application/x-7z-compressed",
"application/x-ar",
@@ -160,6 +161,7 @@ fr_archive_libarchive_get_capabilities (FrArchive *archive,
if ((strcmp (mime_type, "application/vnd.ms-cab-compressed") == 0)
|| (strcmp (mime_type, "application/x-cbr") == 0)
|| (strcmp (mime_type, "application/x-deb") == 0)
+ || (strcmp (mime_type, "application/vnd.debian.binary-package") == 0)
|| (strcmp (mime_type, "application/x-lha") == 0)
|| (strcmp (mime_type, "application/x-rar") == 0)
|| (strcmp (mime_type, "application/x-rpm") == 0)
diff --git a/src/fr-command-ar.c b/src/fr-command-ar.c
index b72b4ac..2500993 100644
--- a/src/fr-command-ar.c
+++ b/src/fr-command-ar.c
@@ -272,7 +272,8 @@ fr_command_ar_handle_error (FrCommand *comm,
}
-const char *ar_mime_type[] = { "application/x-ar",
+const char *ar_mime_type[] = { "application/vnd.debian.binary-package",
+ "application/x-ar",
"application/x-deb",
NULL };
@@ -293,8 +294,11 @@ fr_command_ar_get_capabilities (FrArchive *archive,
capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES;
if (_g_program_is_available ("ar", check_command)) {
- if (_g_mime_type_matches (mime_type, "application/x-deb"))
+ if (_g_mime_type_matches (mime_type, "application/x-deb")
+ || _g_mime_type_matches (mime_type, "application/vnd.debian.binary-package"))
+ {
capabilities |= FR_ARCHIVE_CAN_READ;
+ }
else if (_g_mime_type_matches (mime_type, "application/x-ar"))
capabilities |= FR_ARCHIVE_CAN_READ_WRITE;
}
diff --git a/src/fr-command-dpkg.c b/src/fr-command-dpkg.c
index ea2657a..3a12c28 100644
--- a/src/fr-command-dpkg.c
+++ b/src/fr-command-dpkg.c
@@ -200,7 +200,9 @@ fr_command_dpkg_extract (FrCommand *comm,
}
-const char *dpkg_mime_type[] = { "application/x-deb", NULL };
+const char *dpkg_mime_type[] = { "application/vnd.debian.binary-package",
+ "application/x-deb",
+ NULL };
static const char **
diff --git a/src/fr-init.c b/src/fr-init.c
index db9aba8..cd25b12 100644
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@ -78,6 +78,8 @@ FrMimeTypeDescription mime_type_desc[] = {
{ "application/x-compressed-tar", ".tar.gz", 0 },
{ "application/x-cpio", ".cpio", 0 },
{ "application/x-deb", ".deb", 0 },
+ { "application/x-debian-package", ".deb", 0 },
+ { "application/vnd.debian.binary-package", ".deb", 0 },
{ "application/x-ear", ".ear", 0 },
{ "application/x-ms-dos-executable", ".exe", 0 },
{ "application/x-gzip", ".gz", 0 },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]