font-viewer: replace mateconf schema with thumbnailer file

3 files changed, 7 insertions, 121 deletions

diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am
index 9fd87eac..cd941e8c 100644
--- a/font-viewer/Makefile.am
+++ b/font-viewer/Makefile.am
@@ -10,23 +10,14 @@ mate_thumbnail_font_SOURCES = ftstream-vfs.c font-thumbnailer.c totem-resources.
 mate_font_viewer_LDADD = $(MATECC_CAPPLETS_LIBS) $(FONT_VIEWER_LIBS)
 mate_font_viewer_SOURCES = ftstream-vfs.c font-view.c
 
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_DATA = fontilus.schemas
+thumbnailerdir = $(datadir)/thumbnailers
+thumbnailer_DATA = mate-font-viewer.thumbnailer
 
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-font-viewer.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-install-data-local: install-mateconf-schemas install-desktop-database
-
-if MATECONF_SCHEMAS_INSTALL
-install-mateconf-schemas:
-	if test -z "$(DESTDIR)"; then \
-	  MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule fontilus.schemas; \
-	fi
-else
-install-mateconf-schemas:
-endif
+install-data-local: install-desktop-database
 
 install-desktop-database: install-desktopDATA
 	update-desktop-database $(DESTDIR)$(desktopdir)
diff --git a/font-viewer/fontilus.schemas.in b/font-viewer/fontilus.schemas.in
deleted file mode 100644
index 2e303465..00000000
--- a/font-viewer/fontilus.schemas.in
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<mateconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-ttf/command</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-ttf/command</applyto>
-      <type>string</type>
-      <default>mate-thumbnail-font %u %o</default>
-      <locale name="C">
-        <short>Thumbnail command for TrueType fonts</short>
-        <long>
-          Set this key to the command used to create thumbnails for
-          TrueType fonts.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-ttf/enable</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-ttf/enable</applyto>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to thumbnail TrueType fonts</short>
-        <long>
-          If set to true, then TrueType fonts will be thumbnailed.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-type1/command</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-type1/command</applyto>
-      <type>string</type>
-      <default>mate-thumbnail-font %u %o</default>
-      <locale name="C">
-        <short>Thumbnail command for Type1 fonts</short>
-        <long>
-          Set this key to the command used to create thumbnails for
-          Type1 fonts.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-type1/enable</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-type1/enable</applyto>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to thumbnail Type1 fonts</short>
-        <long>
-          If set to true, then Type1 fonts will be thumbnailed.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-pcf/command</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-pcf/command</applyto>
-      <type>string</type>
-      <default>mate-thumbnail-font %u %o</default>
-      <locale name="C">
-        <short>Thumbnail command for PCF fonts</short>
-        <long>
-          Set this key to the command used to create thumbnails for
-          PCF fonts.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-pcf/enable</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-pcf/enable</applyto>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to thumbnail PCF fonts</short>
-        <long>
-          If set to true, then PCF fonts will be thumbnailed.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-otf/command</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-otf/command</applyto>
-      <type>string</type>
-      <default>mate-thumbnail-font %u %o</default>
-      <locale name="C">
-        <short>Thumbnail command for OpenType fonts</short>
-        <long>
-          Set this key to the command used to create thumbnails for
-          OpenType fonts.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/mate/thumbnailers/application@x-font-otf/enable</key>
-      <applyto>/desktop/mate/thumbnailers/application@x-font-otf/enable</applyto>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to thumbnail OpenType fonts</short>
-        <long>
-          If set to true, then OpenType fonts will be thumbnailed.
-        </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</mateconfschemafile>
diff --git a/font-viewer/mate-font-viewer.thumbnailer b/font-viewer/mate-font-viewer.thumbnailer
new file mode 100644
index 00000000..eb6d4848
--- /dev/null
+++ b/font-viewer/mate-font-viewer.thumbnailer
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=mate-thumbnail-font
+Exec=mate-thumbnail-font %u %o
+MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-pcf;application/x-font-otf