summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2017-06-26 11:48:10 +0200
committerBastien Nocera <hadess@hadess.net>2017-06-26 12:02:44 +0200
commitfaf3c581e13dc0c2170c648cd6f4191aa83e889f (patch)
tree7233ecc005560ccfa9bca7139fa3ef1e08d47ef6 /data
parent560bf4c7b5c26756c6f9a5fbbaec97a5e5e911fb (diff)
downloadtotem-faf3c581e13dc0c2170c648cd6f4191aa83e889f.tar.gz
build: Replaced thumbnailer template file
The totem.thumbnailer.in file, which is not used any more on the meson build port, has been replaced by the meson template, whose contents were used but renaming it in order to make its filename consistent with the rest of the files. https://bugzilla.gnome.org/show_bug.cgi?id=784179
Diffstat (limited to 'data')
-rw-r--r--data/meson.build2
-rw-r--r--data/totem.thumbnailer.in1
-rw-r--r--data/totem.thumbnailer.meson4
3 files changed, 2 insertions, 5 deletions
diff --git a/data/meson.build b/data/meson.build
index f75752795..1a4f56740 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -100,7 +100,7 @@ thumbnailer_conf.set('MIME_TYPE', r.stdout().strip())
thumbnailer = 'totem.thumbnailer'
configure_file(
- input: thumbnailer + '.meson',
+ input: thumbnailer + '.in',
output: thumbnailer,
install: true,
install_dir: join_paths(totem_datadir, 'thumbnailers'),
diff --git a/data/totem.thumbnailer.in b/data/totem.thumbnailer.in
index 45be6e244..650a92696 100644
--- a/data/totem.thumbnailer.in
+++ b/data/totem.thumbnailer.in
@@ -1,3 +1,4 @@
[Thumbnailer Entry]
TryExec=@BINDIR@/totem-video-thumbnailer
Exec=@BINDIR@/totem-video-thumbnailer -s %s %u %o
+@MIME_TYPE@
diff --git a/data/totem.thumbnailer.meson b/data/totem.thumbnailer.meson
deleted file mode 100644
index 650a92696..000000000
--- a/data/totem.thumbnailer.meson
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=@BINDIR@/totem-video-thumbnailer
-Exec=@BINDIR@/totem-video-thumbnailer -s %s %u %o
-@MIME_TYPE@