From 3294f7102500ef787ffd0314c95bfe59c0c9a6bf Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <nshmyrev@src.gnome.org>
Date: Sat, 21 May 2005 11:46:37 +0000
Subject: [PATCH] Conditionally add dvi and djvu mime types to desktop file.
 Fix for 304658

---
 ChangeLog                                        | 10 ++++++++++
 configure.ac                                     | 14 +++++++++++++-
 data/Makefile.am                                 |  4 ++--
 data/{evince.desktop.in => evince.desktop.in.in} |  2 +-
 po/POTFILES.in                                   |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)
 rename data/{evince.desktop.in => evince.desktop.in.in} (83%)

diff --git a/ChangeLog b/ChangeLog
index 59e8973c..8240a131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-21  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* configure.ac:
+	* data/Makefile.am:
+	* data/evince.desktop.in: 
+	* data/evince.desktop.in.in:
+	* po/POTFILES.in:
+	
+	Add conditionally dvi and djvu to desktop types. Fix for 304658.
+
 Sat May 21 00:21:30 2005  Jonathan Blandford  <jrb@redhat.com>
 
 	* shell/ev-view.c: (view_update_adjustments),
diff --git a/configure.ac b/configure.ac
index 93c9db9d..4d9f0c0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,18 @@ AM_CONDITIONAL(WITH_TYPE1_FONTS, test x$enable_type1_fonts = xyes)
 
 dnl ================== End of dvi checks ===================================================
 
+dnl =================== Mime types list ====================================================
+
+EVINCE_MIME_TYPES="application/pdf;application/postscript;application/x-gzpostscript"
+
+if test "x$enable_dvi" = "xyes"; then
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-dvi"
+fi
+if test "x$enable_djvu" = "xyes"; then
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/vnd.djvu"
+fi
+AC_SUBST(EVINCE_MIME_TYPES)
+
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
 dnl stolen from nautilus and gnome-common
 
@@ -216,7 +228,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-
 AC_OUTPUT([
 Makefile
 cut-n-paste/Makefile
@@ -224,6 +235,7 @@ cut-n-paste/recent-files/Makefile
 cut-n-paste/zoom-control/Makefile
 cut-n-paste/toolbar-editor/Makefile
 data/Makefile
+data/evince.desktop.in
 lib/Makefile
 pdf/Makefile
 pixbuf/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 9eece2b2..183e455f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,8 +15,8 @@ glade_DATA = 				\
 	evince-password.glade		\
 	$(NULL)
 
-DESKTOP_IN_FILES= evince.desktop.in
-DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+DESKTOP_IN_FILES= evince.desktop.in.in
+DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
diff --git a/data/evince.desktop.in b/data/evince.desktop.in.in
similarity index 83%
rename from data/evince.desktop.in
rename to data/evince.desktop.in.in
index 2d9083c9..4edf5869 100644
--- a/data/evince.desktop.in
+++ b/data/evince.desktop.in.in
@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=evince
 X-GNOME-Bugzilla-Component=General
 Categories=GNOME;Application;Graphics;VectorGraphics;Viewer;
-MimeType=application/pdf;application/postscript;application/x-gzpostscript
+MimeType=@EVINCE_MIME_TYPES@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index efc30ec4..51a1c5a0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 [encoding: UTF-8]
 cut-n-paste/zoom-control/ephy-zoom.h
 data/evince-password.glade
-data/evince.desktop.in
+data/evince.desktop.in.in
 data/evince.schemas.in
 cut-n-paste/toolbar-editor/egg-toolbar-editor.c
 dvi/mdvi-lib/dviread.c
-- 
2.43.5