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 f819b9716825083405ab15ae4e1de4c3d225fede..7ba2714cfa8a50f5a1c78e4883c462915ad1b970 100644 (file)
--- 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 c755d26c096512ba7351b4bde5b5818a0ba3a3e5..e3039297d372c942e0582101d5255a482e3ca7a5 100644 (file)
--- 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 12eddf8ce398d8ae56fb142ec02cb7d84dc01087..f52b161bb8a65da680a4dba79a65dcf6124ce720 100644 (file)
--- 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