diff options
| author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-12-20 16:54:15 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-12-20 16:54:15 (GMT) |
| commit | 3ec63537add6165440f67c6c6ad8413a40724c13 (patch) | |
| tree | b62b8450466458c3eddd3f03070d3909277e1b22 /comics | |
| parent | 4799d9b27db47383f3944f49338d67e2c32f15fb (diff) | |
Comics mime types are added to shared-mime-info CVS. Now we don't need to
* backend/ev-document-factory.c:
* comics/Makefile.am:
* comics/comics-document.c: (comics_document_load):
* comics/ev-cbr-mime.xml:
* configure.ac:
Comics mime types are added to shared-mime-info CVS. Now
we don't need to install our own mime types.
Diffstat (limited to 'comics')
| -rw-r--r-- | comics/Makefile.am | 16 | ||||
| -rw-r--r-- | comics/comics-document.c | 4 | ||||
| -rw-r--r-- | comics/ev-cbr-mime.xml | 31 |
3 files changed, 2 insertions, 49 deletions
diff --git a/comics/Makefile.am b/comics/Makefile.am index 7ebf0d9..bf11eb8 100644 --- a/comics/Makefile.am +++ b/comics/Makefile.am @@ -10,19 +10,3 @@ libcomicsdocument_la_SOURCES = \ comics-document.c \ comics-document.h -# need to respect $XDG_DATA_DIR probably -xdgmimedir = $(datadir)/mime/packages -xdgmime_DATA = ev-cbr-mime.xml - -EXTRA_DIST = $(xdgmime_DATA) - -if ENABLE_UPDATE_MIMEDB - -install-data-hook: - $(UPDATE_MIME_DB) $(DESTDIR)$(datadir)/mime - -uninstall-hook: - $(UPDATE_MIME_DB) $(DESTDIR)$(datadir)/mime - -endif # ENABLE_UPDATE_MIMEDB - diff --git a/comics/comics-document.c b/comics/comics-document.c index aa7236a..93cd009 100644 --- a/comics/comics-document.c +++ b/comics/comics-document.c @@ -87,12 +87,12 @@ comics_document_load (EvDocument *document, /* FIXME, use proper cbr/cbz mime types once they're * included in shared-mime-info */ - if (!strcmp (mime_type, "application/cbr")) { + if (!strcmp (mime_type, "application/x-cbr")) { comics_document->extract_command = g_strdup ("unrar p -c- -ierr"); list_files_command = g_strdup_printf ("unrar vb -c- -- %s", quoted_file); - } else if (!strcmp (mime_type, "application/cbz")) { + } else if (!strcmp (mime_type, "application/x-cbz")) { comics_document->extract_command = g_strdup ("unzip -p -C"); list_files_command = diff --git a/comics/ev-cbr-mime.xml b/comics/ev-cbr-mime.xml deleted file mode 100644 index 4a92993..0000000 --- a/comics/ev-cbr-mime.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/cbr"> - <sub-class-of type="application/x-rar"/> - <comment>CBR document</comment> - <comment xml:lang="cy">Dogfen CBR</comment> - <comment xml:lang="da">CBR-dokument</comment> - <comment xml:lang="de">CBR-Dokument</comment> - <comment xml:lang="fi">CBR-asiakirja</comment> - <comment xml:lang="nn">CBR-dokument</comment> - <comment xml:lang="no">CBR-dokument</comment> - <comment xml:lang="ru">CBR документ</comment> - <comment xml:lang="sr">CBR документ</comment> - <comment xml:lang="sv">CBR-dokument</comment> - <glob pattern="*.cbr"/> - </mime-type> - <mime-type type="application/cbz"> - <sub-class-of type="application/zip"/> - <comment>CBZ document</comment> - <comment xml:lang="cy">Dogfen CBZ</comment> - <comment xml:lang="da">CBZ-dokument</comment> - <comment xml:lang="de">CBZ-Dokument</comment> - <comment xml:lang="fi">CBZ-asiakirja</comment> - <comment xml:lang="nn">CBZ-dokument</comment> - <comment xml:lang="no">CBZ-dokument</comment> - <comment xml:lang="ru">CBZ-документ</comment> - <comment xml:lang="sr">CBZ-документ</comment> - <comment xml:lang="sv">CBZ-dokument</comment> - <glob pattern="*.cbz"/> - </mime-type> -</mime-info>
\ No newline at end of file |