From: Götz Waschk <waschk@mandriva.org>
Date: Wed, 5 Sep 2007 08:41:22 +0000 (+0000)
Subject: Fixes desktop file issues. See bug #473471.
X-Git-Tag: EVINCE_2_20_0~19
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=084c2e5beb02de1e5ced358e782db12a502ea65b;p=evince.git

Fixes desktop file issues. See bug #473471.

2007-09-05  Götz Waschk  <waschk@mandriva.org>

	* configure.ac:
	* data/evince.desktop.in.in:

	Fixes desktop file issues. See bug #473471.


svn path=/trunk/; revision=2665
---

diff --git a/ChangeLog b/ChangeLog
index f819b971..7ba2714c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-05  Götz Waschk  <waschk@mandriva.org>
+
+	* configure.ac:
+	* data/evince.desktop.in.in:
+	
+	Fixes desktop file issues. See bug #473471.
+
 2007-09-04  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/ev-job-queue.c: (handle_job), (search_for_jobs_unlocked),
diff --git a/configure.ac b/configure.ac
index c755d26c..e3039297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -421,28 +421,28 @@ dnl ================== End of impress book checks ==============================
 dnl =================== Mime types list ====================================================
 
 if test "x$enable_pdf" = "xyes" ; then
-	EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf"
+	EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;"
 fi
 if test "x$enable_ps" = "xyes" ; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;"
 fi
 if test "x$enable_dvi" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-dvi"
+	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"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/vnd.djvu;"
 fi
 if test "x$enable_tiff" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/tiff"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/tiff;"
 fi
 if test "x$enable_comics" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;"
 fi
 if test "x$enable_pixbuf" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"
 fi
 if test "x$enable_impress" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation"
+	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation;"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in
index 12eddf8c..f52b161b 100644
--- a/data/evince.desktop.in.in
+++ b/data/evince.desktop.in.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=Document Viewer
 _GenericName=Document Viewer
 _Comment=View multipage documents