the Flash mime type should be handled by the shared-mime-info package

3 files changed, 2 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 73e7ef8..f3499dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ missing
 mkinstalldirs
 stamp-h1
 data/swfdec-player.desktop
-data/swfdec.xml
 player/.deps
 player/Makefile
 player/Makefile.in
diff --git a/data/Makefile.am b/data/Makefile.am
index e85ceef..59cdcf1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,18 +1,11 @@
 EXTRA_DIST =			\
-	swfdec-player.desktop.in\
-	swfdec.xml.in
+	swfdec-player.desktop.in
 
 desktop_in_files = swfdec-player.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-mime_in_files = swfdec.xml.in
-mimedir = $(datadir)/mime/packages
-mime_DATA = $(mime_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
-
 CLEANFILES = 			\
-	swfdec-player.desktop	\
-	swfdec.xml
+	swfdec-player.deskto
 
diff --git a/data/swfdec.xml.in b/data/swfdec.xml.in
deleted file mode 100644
index 34be08e..0000000
--- a/data/swfdec.xml.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-
-   <mime-type type="application/x-shockwave-flash">
-     <_comment>Adobe/Macromedia Flash animation</_comment>
-     <glob pattern="*.swf"/>
-   </mime-type>
-
-   <mime-type type="video/x-flv">
-     <_comment>Adobe/Macromedia Flash video</_comment>
-     <glob pattern="*.flv"/>
-     <alias type="video/flv"/>
-     <alias type="flv-application/octet-stream"/>
-   </mime-type>
-
-   <mime-type type="application/futuresplash">
-     <_comment>???</_comment>
-     <glob pattern="*.spl"/>
-   </mime-type>
-
-<!-- fla?? -->
-
-</mime-info>
-