From a7abb688a3bc43d6c4e19d3165e052ef8d8e838d Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 21 Mar 2007 01:16:06 +0000 Subject: [PATCH] - convert to the xdg mimetypes - remove the self-installed mimetypes, as they are in freedesktop.org or in our db svn path=/trunk/playground/graphics/okular/; revision=644840 --- generators/chm/libokularGenerator_chmlib.desktop | 2 +- generators/chm/okularChm.desktop | 2 +- generators/comicbook/CMakeLists.txt | 2 +- generators/comicbook/x-cbr.desktop | 7 ------- generators/comicbook/x-cbz.desktop | 7 ------- generators/djvu/libokularGenerator_djvu.desktop | 2 +- generators/djvu/okularDjvu.desktop | 2 +- generators/kimgio/libokularGenerator_kimgio.desktop | 2 +- generators/kimgio/okularKimgio.desktop | 2 +- generators/plucker/CMakeLists.txt | 2 +- generators/plucker/libokularGenerator_plucker.desktop | 2 +- generators/plucker/okularPlucker.desktop | 2 +- generators/plucker/x-plucker.desktop | 7 ------- 13 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 generators/comicbook/x-cbr.desktop delete mode 100644 generators/comicbook/x-cbz.desktop delete mode 100644 generators/plucker/x-plucker.desktop diff --git a/generators/chm/libokularGenerator_chmlib.desktop b/generators/chm/libokularGenerator_chmlib.desktop index e70050212..dde00e425 100644 --- a/generators/chm/libokularGenerator_chmlib.desktop +++ b/generators/chm/libokularGenerator_chmlib.desktop @@ -4,7 +4,7 @@ Type=Service Name=chmlib Comment=Windows HTMLHelp backend for okular ServiceTypes=okular/Generator -MimeType=application/chm +MimeType=application/x-chm X-KDE-Library=libokularGenerator_chmlib X-KDE-Priority=2 X-KDE-okularAPIVersion=1 diff --git a/generators/chm/okularChm.desktop b/generators/chm/okularChm.desktop index d972f6626..a92cfa8c2 100644 --- a/generators/chm/okularChm.desktop +++ b/generators/chm/okularChm.desktop @@ -5,4 +5,4 @@ Name=okular ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=libokularpart Type=Service -MimeType=application/chm +MimeType=application/x-chm diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt index c7b5268f0..a9e3de914 100644 --- a/generators/comicbook/CMakeLists.txt +++ b/generators/comicbook/CMakeLists.txt @@ -23,4 +23,4 @@ install(TARGETS okularGenerator_comicbook DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES libokularGenerator_comicbook.desktop okularComicbook.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES x-cbz.desktop x-cbr.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) + diff --git a/generators/comicbook/x-cbr.desktop b/generators/comicbook/x-cbr.desktop deleted file mode 100644 index 221183858..000000000 --- a/generators/comicbook/x-cbr.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=MimeType -Encoding=UTF-8 -MimeType=application/x-cbr -Icon=package_toys -Patterns=*.cbr;*.CBR; -Comment=Comic Book diff --git a/generators/comicbook/x-cbz.desktop b/generators/comicbook/x-cbz.desktop deleted file mode 100644 index 89cce1102..000000000 --- a/generators/comicbook/x-cbz.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=MimeType -Encoding=UTF-8 -MimeType=application/x-cbz -Icon=package_toys -Patterns=*.cbz;*.CBZ; -Comment=Comic Book diff --git a/generators/djvu/libokularGenerator_djvu.desktop b/generators/djvu/libokularGenerator_djvu.desktop index fc30ebafc..5d053b162 100644 --- a/generators/djvu/libokularGenerator_djvu.desktop +++ b/generators/djvu/libokularGenerator_djvu.desktop @@ -4,7 +4,7 @@ Type=Service Name=djvu Comment=DjVu backend for okular ServiceTypes=okular/Generator -MimeType=image/x-djvu +MimeType=image/vnd.djvu X-KDE-Library=libokularGenerator_djvu X-KDE-Priority=2 X-KDE-okularAPIVersion=1 diff --git a/generators/djvu/okularDjvu.desktop b/generators/djvu/okularDjvu.desktop index 194abb3b8..0cf5827ec 100644 --- a/generators/djvu/okularDjvu.desktop +++ b/generators/djvu/okularDjvu.desktop @@ -5,4 +5,4 @@ Name=okular ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=libokularpart Type=Service -MimeType=image/x-djvu +MimeType=image/vnd.djvu diff --git a/generators/kimgio/libokularGenerator_kimgio.desktop b/generators/kimgio/libokularGenerator_kimgio.desktop index 7af10c880..bc906ad0a 100644 --- a/generators/kimgio/libokularGenerator_kimgio.desktop +++ b/generators/kimgio/libokularGenerator_kimgio.desktop @@ -4,7 +4,7 @@ Type=Service Name=KDE Image libraries Comment=Image backend for okular ServiceTypes=okular/Generator -MimeType=image/x-bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-greymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-targa;image/tiff;image/x-xbm;image/x-xcf-gimp;image/x-xpm; +MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; X-KDE-Library=libokularGenerator_kimgio X-KDE-Priority=1 X-KDE-okularAPIVersion=1 diff --git a/generators/kimgio/okularKimgio.desktop b/generators/kimgio/okularKimgio.desktop index 4f8718629..6600442a9 100644 --- a/generators/kimgio/okularKimgio.desktop +++ b/generators/kimgio/okularKimgio.desktop @@ -5,4 +5,4 @@ Name=okular ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=libokularpart Type=Service -MimeType=image/x-bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-greymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-targa;image/tiff;image/x-xbm;image/x-xcf-gimp;image/x-xpm; +MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap; diff --git a/generators/plucker/CMakeLists.txt b/generators/plucker/CMakeLists.txt index 8244c2204..db5518f6e 100644 --- a/generators/plucker/CMakeLists.txt +++ b/generators/plucker/CMakeLists.txt @@ -31,4 +31,4 @@ install(TARGETS okularGenerator_plucker DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES libokularGenerator_plucker.desktop okularPlucker.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES x-plucker.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) + diff --git a/generators/plucker/libokularGenerator_plucker.desktop b/generators/plucker/libokularGenerator_plucker.desktop index 06dd90dbe..c7905cd00 100644 --- a/generators/plucker/libokularGenerator_plucker.desktop +++ b/generators/plucker/libokularGenerator_plucker.desktop @@ -4,7 +4,7 @@ Type=Service Name=Plucker document Comment=Plucker backend for okular ServiceTypes=okular/Generator -MimeType=application/x-plucker +MimeType=application/prs.plucker X-KDE-Library=libokularGenerator_plucker X-KDE-Priority=1 X-KDE-okularAPIVersion=1 diff --git a/generators/plucker/okularPlucker.desktop b/generators/plucker/okularPlucker.desktop index c12fdc80d..2efff2ad0 100644 --- a/generators/plucker/okularPlucker.desktop +++ b/generators/plucker/okularPlucker.desktop @@ -5,4 +5,4 @@ Name=okular ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=libokularpart Type=Service -MimeType=application/x-plucker +MimeType=application/prs.plucker diff --git a/generators/plucker/x-plucker.desktop b/generators/plucker/x-plucker.desktop deleted file mode 100644 index 6576b1327..000000000 --- a/generators/plucker/x-plucker.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=MimeType -Encoding=UTF-8 -MimeType=application/x-plucker -Icon=package_toys -Patterns=*.pdb;*.PDB; -Comment=Plucker Document