[evince] thumbnailer: Do not use GConf to register evince-thumbnailer

[Carlos Garcia Campos <carlosgc src gnome org>]

commit eb3e783ab46d2034e2832c6ae86b8805023879d1
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Thu Dec 30 13:13:18 2010 +0100

    thumbnailer: Do not use GConf to register evince-thumbnailer
    
    Use a key file instead and remove old gconf schemas. Fixes bug #638343

 configure.ac                                     |   30 ----
 thumbnailer/Makefile.am                          |   54 ++-------
 thumbnailer/evince-thumbnailer-comics.schemas.in |  106 ---------------
 thumbnailer/evince-thumbnailer-djvu.schemas.in   |   30 ----
 thumbnailer/evince-thumbnailer-dvi.schemas.in    |   83 ------------
 thumbnailer/evince-thumbnailer-ps.schemas.in     |  154 ----------------------
 thumbnailer/evince-thumbnailer.schemas.in        |   80 -----------
 thumbnailer/evince.thumbnailer.in                |    4 +
 8 files changed, 13 insertions(+), 528 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index afd863f..b3a42f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,35 +292,6 @@ if test x$has_desktop_schemas = xyes; then
    AC_DEFINE([HAVE_DESKTOP_SCHEMAS], [1], [Whether GSettings Desktop Schemas are available])
 fi
 
-dnl ========= Check for GConf
-
-AC_MSG_CHECKING([whether GConf support is requested])
-AC_ARG_WITH([gconf],
-  [AS_HELP_STRING([--without-gconf],
-		  [Disable the use of gconf])],
-  [],
-  [case "$os_win32" in
-     yes) with_gconf=no ;;
-     *) with_gconf=yes ;;
-   esac])
-AC_MSG_RESULT([$with_gconf])
-
-AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
-
-if test "$with_gconf" = "yes"; then
-   PKG_CHECK_MODULES([GCONF],[gconf-2.0])
-   AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
-
-   AM_GCONF_SOURCE_2
-
-   AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
-   if test "$GCONFTOOL" = "false"; then
-      AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-   fi
-else
-   AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false)
-fi
-
 dnl Debug mode
 
 AC_ARG_ENABLE([debug],
@@ -827,7 +798,6 @@ AC_OUTPUT
 echo "
 Configure summary:
         Platform...........:  $with_platform
-        GConf Support......:  $with_gconf
 	GTK+ Unix Print....:  $with_gtk_unix_print
 	Keyring Support....:  $with_keyring
 	DBUS Support.......:  $enable_dbus
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 28a8483..d7e5ae5 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -28,56 +28,20 @@ evince_thumbnailer_LDADD = \
 	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(FRONTEND_LIBS)
 
-schema_files = \
-	evince-thumbnailer-dvi.schemas.in  \
-	evince-thumbnailer-djvu.schemas.in \
-	evince-thumbnailer-comics.schemas.in \
-	evince-thumbnailer-ps.schemas.in \
-	evince-thumbnailer.schemas.in
+thumbnailerdir = $(datadir)/thumbnailers
+thumbnailer_in_files = evince.thumbnailer.in
+thumbnailer_DATA = $(thumbnailer_in_files:.thumbnailer.in=.thumbnailer)
 
-if WITH_GCONF
+evince.thumbnailer: $(thumbnailer_in_files)
+	$(AM_V_GEN)sed \
+		-e "s|\ EVINCE_MIME_TYPES\@|$(EVINCE_MIME_TYPES)|" \
+		$< > $@
 
- INTLTOOL_SCHEMAS_RULE@
-
-schema_DATA = 
-
-if ENABLE_PDF
-schema_DATA += evince-thumbnailer.schemas
-endif
-
-if ENABLE_PS
-schema_DATA += evince-thumbnailer-ps.schemas
-endif
-
-if ENABLE_DJVU
-schema_DATA += evince-thumbnailer-djvu.schemas
-endif
-
-if ENABLE_DVI
-schema_DATA += evince-thumbnailer-dvi.schemas
-endif
-
-if ENABLE_COMICS
-schema_DATA += evince-thumbnailer-comics.schemas
-endif
-
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-	for p in $(schema_DATA) ; do \
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/thumbnailer/$$p >&1 > /dev/null; \
-	done \
-	fi
-endif
-
-endif # WITH_GCONF
 
 EXTRA_DIST =         	\
-	$(schema_files)  
+	$(thumbnailer_in_files)
 
 DISTCLEANFILES = \
-	$(schema_DATA)
+	$(thumbnailer_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/thumbnailer/evince.thumbnailer.in b/thumbnailer/evince.thumbnailer.in
new file mode 100644
index 0000000..de14ab3
--- /dev/null
+++ b/thumbnailer/evince.thumbnailer.in
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=evince-thumbnailer
+Exec=evince-thumbnailer -s %s %u %o
+MimeType= EVINCE_MIME_TYPES@