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.

6 files changed, 16 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 65b09fe..324d598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-12-20  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
+	* 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.
+
+2005-12-20  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
 	* shell/ev-window.c:
 	
 	Add shortcut for "save a copy" menu entry. Fix for
diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index f9118b6..1cf3014 100644
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -75,8 +75,8 @@ const EvDocumentType document_types[] = {
 
 #ifdef ENABLE_COMICS
 	/* cbr/cbz: */
-	{"application/cbr",           EV_BACKEND_COMICS,  comics_document_get_type},
-	{"application/cbz",           EV_BACKEND_COMICS,  comics_document_get_type},
+	{"application/x-cbr",           EV_BACKEND_COMICS,  comics_document_get_type},
+	{"application/x-cbz",           EV_BACKEND_COMICS,  comics_document_get_type},
 #endif
 };
 
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
diff --git a/configure.ac b/configure.ac
index 2f59eb0..3fe05b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,19 +272,9 @@ AC_ARG_ENABLE(comics,
  	[AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics=yes,enable_comics=no)
 if test "x$enable_comics" = "xyes"; then
 	AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
-
 fi 
 AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
 
-AC_PATH_PROG(UPDATE_MIME_DB, update-mime-database, no)
-AC_SUBST(UPDATE_MIME_DB)
-
-AC_ARG_ENABLE(update-mimedb,
-   AC_HELP_STRING([--disable-update-mimedb],
-                   [disable the update-mime-database after install [default=no]]),,
-    enable_update_mimedb=yes)
-AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-
 dnl ================== End of comic book checks ============================================
 
 dnl =================== Mime types list ====================================================
@@ -301,7 +291,7 @@ if test "x$enable_tiff" = "xyes"; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/tiff"
 fi
 if test "x$enable_comics" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/cbr;application/cbz"
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)