thumbnailer: Do not use GConf to register evince-thumbnailer

Use a key file instead and remove old gconf schemas. Fixes bug #638343

diff --git a/configure.ac b/configure.ac
index afd863fd035ff2d935761654f4e1e5dd30da6a5a..b3a42f95dac60d09c0ff89601873babbbd787ed6 100644 (file)
--- 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 28a8483de3cca6f98b17cae9633dc8f863eafb08..d7e5ae55feeaeb358a204bb1a5af49d53b2ae879 100644 (file)
--- 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-comics.schemas.in b/thumbnailer/evince-thumbnailer-comics.schemas.in
deleted file mode 100644 (file)
index a474935..0000000
--- a/thumbnailer/evince-thumbnailer-comics.schemas.in
+++ /dev/null
@@ -1,106 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cbz/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cbz/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cbz/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cbz/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cbr/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cbr/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cbr/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cbr/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-       <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cb7/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cb7/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cb7/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cb7/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-       <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cbt/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cbt/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-cbt/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-cbt/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-    </schemalist>
-</gconfschemafile>

diff --git a/thumbnailer/evince-thumbnailer-djvu.schemas.in b/thumbnailer/evince-thumbnailer-djvu.schemas.in
deleted file mode 100644 (file)
index 017c757..0000000
--- a/thumbnailer/evince-thumbnailer-djvu.schemas.in
+++ /dev/null
@@ -1,30 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@vnd.djvu/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/image@vnd.djvu/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@vnd.djvu/command</key>
-            <applyto>/desktop/gnome/thumbnailers/image@vnd.djvu/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-    </schemalist>
-</gconfschemafile>

diff --git a/thumbnailer/evince-thumbnailer-dvi.schemas.in b/thumbnailer/evince-thumbnailer-dvi.schemas.in
deleted file mode 100644 (file)
index 6e64eb2..0000000
--- a/thumbnailer/evince-thumbnailer-dvi.schemas.in
+++ /dev/null
@@ -1,83 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-dvi/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-dvi/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-dvi/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-dvi/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-gzdvi/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-gzdvi/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-gzdvi/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-gzdvi/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-bzdvi/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-bzdvi/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-bzdvi/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-bzdvi/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-    </schemalist>
-</gconfschemafile>

diff --git a/thumbnailer/evince-thumbnailer-ps.schemas.in b/thumbnailer/evince-thumbnailer-ps.schemas.in
deleted file mode 100644 (file)
index 1c6fe06..0000000
--- a/thumbnailer/evince-thumbnailer-ps.schemas.in
+++ /dev/null
@@ -1,154 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@postscript/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@postscript/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@postscript/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@postscript/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-bzpostscript/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-bzpostscript/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-bzpostscript/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-bzpostscript/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-gzpostscript/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-gzpostscript/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-gzpostscript/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-gzpostscript/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@x-eps/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/image@x-eps/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@x-eps/command</key>
-            <applyto>/desktop/gnome/thumbnailers/image@x-eps/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@x-bzeps/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/image@x-bzeps/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@x-bzeps/command</key>
-            <applyto>/desktop/gnome/thumbnailers/image@x-bzeps/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@x-gzeps/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/image@x-gzeps/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/image@x-gzeps/command</key>
-            <applyto>/desktop/gnome/thumbnailers/image@x-gzeps/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-    </schemalist>
-</gconfschemafile>

diff --git a/thumbnailer/evince-thumbnailer.schemas.in b/thumbnailer/evince-thumbnailer.schemas.in
deleted file mode 100644 (file)
index 40221be..0000000
--- a/thumbnailer/evince-thumbnailer.schemas.in
+++ /dev/null
@@ -1,80 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@pdf/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@pdf/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short>Enable thumbnailing of PDF Documents</short>
-                <long>Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails</long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@pdf/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@pdf/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short>Thumbnail command for PDF Documents</short>
-                <long>Valid command plus arguments for the PDF Document thumbnailer.  See Nautilus thumbnailer documentation for more information.</long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-bzpdf/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-bzpdf/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short>Enable thumbnailing of PDF Documents</short>
-                <long>Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails</long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-bzpdf/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-bzpdf/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short>Thumbnail command for PDF Documents</short>
-                <long>Valid command plus arguments for the PDF Document thumbnailer.  See Nautilus thumbnailer documentation for more information.</long>
-            </locale>
-        </schema>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-gzpdf/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-gzpdf/enable</applyto>
-            <owner>evince</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short>Enable thumbnailing of PDF Documents</short>
-                <long>Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails</long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-gzpdf/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-gzpdf/command</applyto>
-            <owner>evince</owner>
-            <type>string</type>
-            <default>evince-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short>Thumbnail command for PDF Documents</short>
-                <long>Valid command plus arguments for the PDF Document thumbnailer.  See Nautilus thumbnailer documentation for more information.</long>
-            </locale>
-        </schema>
-
-    </schemalist>
-</gconfschemafile>

diff --git a/thumbnailer/evince.thumbnailer.in b/thumbnailer/evince.thumbnailer.in
new file mode 100644 (file)
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@