From: Carlos Garcia Campos Date: Thu, 30 Dec 2010 12:13:18 +0000 (+0100) Subject: thumbnailer: Do not use GConf to register evince-thumbnailer X-Git-Tag: EVINCE_2_91_5~3 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=eb3e783ab46d2034e2832c6ae86b8805023879d1;p=evince.git 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 afd863fd..b3a42f95 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 28a8483d..d7e5ae55 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-comics.schemas.in b/thumbnailer/evince-thumbnailer-comics.schemas.in deleted file mode 100644 index a4749351..00000000 --- a/thumbnailer/evince-thumbnailer-comics.schemas.in +++ /dev/null @@ -1,106 +0,0 @@ - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cbz/enable - /desktop/gnome/thumbnailers/application@x-cbz/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cbz/command - /desktop/gnome/thumbnailers/application@x-cbz/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cbr/enable - /desktop/gnome/thumbnailers/application@x-cbr/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cbr/command - /desktop/gnome/thumbnailers/application@x-cbr/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cb7/enable - /desktop/gnome/thumbnailers/application@x-cb7/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cb7/command - /desktop/gnome/thumbnailers/application@x-cb7/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cbt/enable - /desktop/gnome/thumbnailers/application@x-cbt/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-cbt/command - /desktop/gnome/thumbnailers/application@x-cbt/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - diff --git a/thumbnailer/evince-thumbnailer-djvu.schemas.in b/thumbnailer/evince-thumbnailer-djvu.schemas.in deleted file mode 100644 index 017c757d..00000000 --- a/thumbnailer/evince-thumbnailer-djvu.schemas.in +++ /dev/null @@ -1,30 +0,0 @@ - - - - - /schemas/desktop/gnome/thumbnailers/image@vnd.djvu/enable - /desktop/gnome/thumbnailers/image@vnd.djvu/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@vnd.djvu/command - /desktop/gnome/thumbnailers/image@vnd.djvu/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - diff --git a/thumbnailer/evince-thumbnailer-dvi.schemas.in b/thumbnailer/evince-thumbnailer-dvi.schemas.in deleted file mode 100644 index 6e64eb2a..00000000 --- a/thumbnailer/evince-thumbnailer-dvi.schemas.in +++ /dev/null @@ -1,83 +0,0 @@ - - - - - /schemas/desktop/gnome/thumbnailers/application@x-dvi/enable - /desktop/gnome/thumbnailers/application@x-dvi/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-dvi/command - /desktop/gnome/thumbnailers/application@x-dvi/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-gzdvi/enable - /desktop/gnome/thumbnailers/application@x-gzdvi/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-gzdvi/command - /desktop/gnome/thumbnailers/application@x-gzdvi/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-bzdvi/enable - /desktop/gnome/thumbnailers/application@x-bzdvi/enable - evince - bool - true - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-bzdvi/command - /desktop/gnome/thumbnailers/application@x-bzdvi/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - diff --git a/thumbnailer/evince-thumbnailer-ps.schemas.in b/thumbnailer/evince-thumbnailer-ps.schemas.in deleted file mode 100644 index 1c6fe061..00000000 --- a/thumbnailer/evince-thumbnailer-ps.schemas.in +++ /dev/null @@ -1,154 +0,0 @@ - - - - - /schemas/desktop/gnome/thumbnailers/application@postscript/enable - /desktop/gnome/thumbnailers/application@postscript/enable - evince - bool - true - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@postscript/command - /desktop/gnome/thumbnailers/application@postscript/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-bzpostscript/enable - /desktop/gnome/thumbnailers/application@x-bzpostscript/enable - evince - bool - true - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-bzpostscript/command - /desktop/gnome/thumbnailers/application@x-bzpostscript/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-gzpostscript/enable - /desktop/gnome/thumbnailers/application@x-gzpostscript/enable - evince - bool - true - - - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-gzpostscript/command - /desktop/gnome/thumbnailers/application@x-gzpostscript/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@x-eps/enable - /desktop/gnome/thumbnailers/image@x-eps/enable - evince - bool - true - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@x-eps/command - /desktop/gnome/thumbnailers/image@x-eps/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@x-bzeps/enable - /desktop/gnome/thumbnailers/image@x-bzeps/enable - evince - bool - true - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@x-bzeps/command - /desktop/gnome/thumbnailers/image@x-bzeps/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@x-gzeps/enable - /desktop/gnome/thumbnailers/image@x-gzeps/enable - evince - bool - true - - - - - - - - /schemas/desktop/gnome/thumbnailers/image@x-gzeps/command - /desktop/gnome/thumbnailers/image@x-gzeps/command - evince - string - evince-thumbnailer -s %s %u %o - - - - - - - - diff --git a/thumbnailer/evince-thumbnailer.schemas.in b/thumbnailer/evince-thumbnailer.schemas.in deleted file mode 100644 index 40221bee..00000000 --- a/thumbnailer/evince-thumbnailer.schemas.in +++ /dev/null @@ -1,80 +0,0 @@ - - - - - /schemas/desktop/gnome/thumbnailers/application@pdf/enable - /desktop/gnome/thumbnailers/application@pdf/enable - evince - bool - true - - Enable thumbnailing of PDF Documents - Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails - - - - - - /schemas/desktop/gnome/thumbnailers/application@pdf/command - /desktop/gnome/thumbnailers/application@pdf/command - evince - string - evince-thumbnailer -s %s %u %o - - Thumbnail command for PDF Documents - Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. - - - - - /schemas/desktop/gnome/thumbnailers/application@x-bzpdf/enable - /desktop/gnome/thumbnailers/application@x-bzpdf/enable - evince - bool - true - - Enable thumbnailing of PDF Documents - Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-bzpdf/command - /desktop/gnome/thumbnailers/application@x-bzpdf/command - evince - string - evince-thumbnailer -s %s %u %o - - Thumbnail command for PDF Documents - Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. - - - - - /schemas/desktop/gnome/thumbnailers/application@x-gzpdf/enable - /desktop/gnome/thumbnailers/application@x-gzpdf/enable - evince - bool - true - - Enable thumbnailing of PDF Documents - Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails - - - - - - /schemas/desktop/gnome/thumbnailers/application@x-gzpdf/command - /desktop/gnome/thumbnailers/application@x-gzpdf/command - evince - string - evince-thumbnailer -s %s %u %o - - Thumbnail command for PDF Documents - Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. - - - - - diff --git a/thumbnailer/evince.thumbnailer.in b/thumbnailer/evince.thumbnailer.in new file mode 100644 index 00000000..de14ab35 --- /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@