[libgsf] thumbnailer: new installation method

[Morten Welinder <mortenw src gnome org>]

commit bc2b3e081a9cb2f019a18c7896194d62eb5258ce
Author: Morten Welinder <terra gnome org>
Date:   Wed Dec 7 16:46:36 2011 -0500

    thumbnailer: new installation method
    
    From: Vincent Untz <vuntz gnome org>
    Date: Thu, 26 May 2011 22:19:09 +0200
    Subject: [PATCH] Register thumbnailer the new way
    
    We now need a .thumbnailer file in $(datadir)/thumbnailers. This also
    means we don't need the gconf dependency anymore.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=651187

 Makefile.am                                   |    5 +-
 NEWS                                          |    3 +
 configure.in                                  |   27 -
 doc/Makefile.am                               |    7 +-
 thumbnailer/Makefile.am                       |   40 +--
 thumbnailer/gsf-office-thumbnailer.schemas.in |  673 -------------------------
 thumbnailer/gsf-office.thumbnailer            |    4 +
 7 files changed, 11 insertions(+), 748 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a67a74c..5ee516d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,14 +7,11 @@ if WITH_WIN32
   pkgconfig_DATA += libgsf-win32-1.pc
 endif
 
-SUBDIRS = po gsf gsf-win32 doc tools tests m4
+SUBDIRS = po gsf gsf-win32 doc tools tests m4 thumbnailer
 
 if WITH_PYTHON
   SUBDIRS += python
 endif
-if WITH_GCONF
-  SUBDIRS += thumbnailer
-endif
 
 EXTRA_DIST = BUGS HACKING	\
 	intltool-extract.in	\
diff --git a/NEWS b/NEWS
index 98954b6..ed00342 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ Morten:
 	* Cleanup old code.
 	* Drop support for gnome-vfs and bonobo.
 
+Vincent Untz:
+	* New installation method for thumbnailer.  [#651187]
+
 --------------------------------------------------------------------------
 libgsf 1.14.21
 
diff --git a/configure.in b/configure.in
index 9b72c1e..28f72fe 100644
--- a/configure.in
+++ b/configure.in
@@ -419,33 +419,6 @@ else
 fi
 
 # ===================
-# GConf configuration
-AC_ARG_WITH([gconf],
-    AC_HELP_STRING([--without-gconf],[disable the use of gconf (default: auto)]),
-    [],
-    [with_gconf=auto])
-
-AS_IF([test "$with_gconf" != "no"], [
-    PKG_CHECK_EXISTS([gconf-2.0 >= 2.24.0],[
-        AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
-        AS_IF([test "$GCONFTOOL" = "no"], [
-            AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2])
-            have_gconf=no
-            ], [
-            have_gconf=yes
-            ])
-        ],[have_gconf=no])
-    ], [have_gconf=no])
-
-AS_IF([test "$have_gconf" = "yes"], [], [
-    AS_IF([test "$with_gconf" = "yes"],
-        [AC_MSG_ERROR([gconf support requested, but not available.])])
-    ])
-
-AM_GCONF_SOURCE_2
-AM_CONDITIONAL(WITH_GCONF, test "$have_gconf" = "yes")
-
-# ===================
 
 LDFLAGS="-no-undefined $LDFLAGS"
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a539bd9..552d200 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -51,12 +51,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS)
 GTKDOC_LIBS = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
 
 manpagedir   = $(mandir)/man1
-manpage_DATA = gsf-vba-dump.1 gsf.1
-
-# gst-office-thumbnailer is not compiled without gconf
-if WITH_GCONF
-manpage_DATA += gsf-office-thumbnailer.1
-endif
+manpage_DATA = gsf-vba-dump.1 gsf.1 gsf-office-thumbnailer.1
 
 if GTK_DOC_INSTALLED
 include $(top_srcdir)/gtk-doc.make
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 1e033a5..acbefdb 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -1,5 +1,3 @@
- INTLTOOL_SCHEMAS_RULE@
-
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(LIBXML_CFLAGS)
 LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) $(GDK_PIXBUF_LIBS)
 
@@ -8,39 +6,5 @@ bin_PROGRAMS = gsf-office-thumbnailer
 gsf_office_thumbnailer_SOURCES =	\
 	main.c
 
-schema_files = \
-	gsf-office-thumbnailer.schemas.in
-
-schemas = gsf-office-thumbnailer.schemas
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-if GCONF_SCHEMAS_INSTALL
-schema_DATA = $(schemas)
-endif
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-if WITH_WIN32
-if !CROSS_COMPILING
-	if test -z "$(DESTDIR)" -a -n "$(GCONF_SCHEMA_FILE_DIR)" ; then \
-	  for p in $(schemas); do \
-	    (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
-	     echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
-	    cmd /c _temp.bat; \
-	  done \
-	fi
-endif
-else
-	if test -z "$(DESTDIR)" -a -n "$(GCONF_SCHEMA_FILE_DIR)" ; then \
-	  for p in $(schemas); do \
-	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-	      $(GCONFTOOL) --makefile-install-rule $$p; \
-	  done \
-	fi
-endif
-endif
-
-EXTRA_DIST =         	\
-	$(schema_files)  
-
-DISTCLEANFILES = \
-	$(schema_DATA)
+thumbnailerdir = $(datadir)/thumbnailers
+thumbnailer_DATA = gsf-office.thumbnailer
diff --git a/thumbnailer/gsf-office.thumbnailer b/thumbnailer/gsf-office.thumbnailer
new file mode 100644
index 0000000..86bc35b
--- /dev/null
+++ b/thumbnailer/gsf-office.thumbnailer
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=gsf-office-thumbnailer
+Exec=gsf-office-thumbnailer -i %i -o %o -s %s
+MimeType=application/msword;application/vnd.ms-excel;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.oasis.opendocument.image;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.tem
 plate;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.sun.xml.math;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;