summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn James Russell <mr@src.gnome.org>2008-12-04 13:39:23 +0000
committerMartyn James Russell <mr@src.gnome.org>2008-12-04 13:39:23 +0000
commit6b6f4174d250713a642b44bdd0327abf97c88f97 (patch)
treee947ffe21f91a2017c598b1536fe3b9ad286e489
parent81d42fa19532eb2680e1519becbf269afc206079 (diff)
downloadtracker-6b6f4174d250713a642b44bdd0327abf97c88f97.tar.gz
Removed all unused thumbnail code and scripts now they are unused.
* configure.ac: * src/Makefile.am: * src/tracker-thumbnailer/Makefile.am: * src/tracker-thumbnailer/tracker-thumbnailer.c: * thumbnailers/Makefile.am: * thumbnailers/application/Makefile.am: * thumbnailers/application/pdf_thumbnailer: * thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnai ler: * thumbnailers/application/vnd.oasis.opendocument.presentation_thum bnailer: * thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumb nailer: * thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer: * thumbnailers/image/Makefile.am: * thumbnailers/image/gif_thumbnailer: * thumbnailers/image/hildon/gif_thumbnailer: * thumbnailers/image/hildon/jpeg_thumbnailer: * thumbnailers/image/hildon/png_thumbnailer: * thumbnailers/image/hildon/tiff_thumbnailer: * thumbnailers/image/jpeg_thumbnailer: * thumbnailers/image/png_thumbnailer: * thumbnailers/image/tiff_thumbnailer: Removed all unused thumbnail code and scripts now they are unused. svn path=/trunk/; revision=2650
-rw-r--r--ChangeLog27
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am2
-rw-r--r--src/tracker-thumbnailer/Makefile.am15
-rw-r--r--src/tracker-thumbnailer/tracker-thumbnailer.c388
-rw-r--r--thumbnailers/Makefile.am3
-rw-r--r--thumbnailers/application/Makefile.am11
-rwxr-xr-xthumbnailers/application/pdf_thumbnailer4
-rwxr-xr-xthumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer3
-rwxr-xr-xthumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer3
-rwxr-xr-xthumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer3
-rwxr-xr-xthumbnailers/application/vnd.oasis.opendocument.text_thumbnailer3
-rw-r--r--thumbnailers/image/Makefile.am2
-rwxr-xr-xthumbnailers/image/gif_thumbnailer3
-rwxr-xr-xthumbnailers/image/hildon/gif_thumbnailer4
-rwxr-xr-xthumbnailers/image/hildon/jpeg_thumbnailer4
-rwxr-xr-xthumbnailers/image/hildon/png_thumbnailer4
-rwxr-xr-xthumbnailers/image/hildon/tiff_thumbnailer4
-rwxr-xr-xthumbnailers/image/jpeg_thumbnailer3
-rwxr-xr-xthumbnailers/image/png_thumbnailer3
-rwxr-xr-xthumbnailers/image/tiff_thumbnailer3
21 files changed, 27 insertions, 469 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dcb3a2bc..1b612f5f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2008-12-04 Martyn Russell <martyn@imendio.com>
+
+ * configure.ac:
+ * src/Makefile.am:
+ * src/tracker-thumbnailer/Makefile.am:
+ * src/tracker-thumbnailer/tracker-thumbnailer.c:
+ * thumbnailers/Makefile.am:
+ * thumbnailers/application/Makefile.am:
+ * thumbnailers/application/pdf_thumbnailer:
+ * thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnai
+ ler:
+ * thumbnailers/application/vnd.oasis.opendocument.presentation_thum
+ bnailer:
+ * thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumb
+ nailer:
+ * thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer:
+ * thumbnailers/image/Makefile.am:
+ * thumbnailers/image/gif_thumbnailer:
+ * thumbnailers/image/hildon/gif_thumbnailer:
+ * thumbnailers/image/hildon/jpeg_thumbnailer:
+ * thumbnailers/image/hildon/png_thumbnailer:
+ * thumbnailers/image/hildon/tiff_thumbnailer:
+ * thumbnailers/image/jpeg_thumbnailer:
+ * thumbnailers/image/png_thumbnailer:
+ * thumbnailers/image/tiff_thumbnailer: Removed all unused
+ thumbnail code and scripts now they are unused.
+
2008-12-04 Ivan Frade <ivan.frade@nokia.com>
* src/tracker-indexer/tracker-indexer.c
diff --git a/configure.ac b/configure.ac
index 2fd96e9b5..bf304d6da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,7 +1206,6 @@ AC_CONFIG_FILES([
src/tracker-preferences/tracker-preferences.desktop.in
src/tracker-search-tool/Makefile
src/tracker-search-tool/tracker-search-tool.desktop.in
- src/tracker-thumbnailer/Makefile
src/tracker-utils/Makefile
tests/common/Makefile
tests/libtracker-common/Makefile
@@ -1218,9 +1217,6 @@ AC_CONFIG_FILES([
tests/trackerd/Makefile
tests/trackerd/xesam/Makefile
tests/tracker-indexer/Makefile
- thumbnailers/application/Makefile
- thumbnailers/image/Makefile
- thumbnailers/Makefile
utils/Makefile
utils/qdbm/Makefile
utils/tracker-fts/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 271c7b9b8..a8eeb78b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,6 @@ SUBDIRS = \
trackerd \
tracker-utils \
tracker-extract \
- tracker-thumbnailer \
tracker-indexer \
$(build_libtrackergtk) \
$(build_tracker_applet) \
@@ -59,7 +58,6 @@ DIST_SUBDIRS = \
trackerd \
tracker-utils \
tracker-extract \
- tracker-thumbnailer \
tracker-indexer \
libtracker-gtk \
tracker-applet \
diff --git a/src/tracker-thumbnailer/Makefile.am b/src/tracker-thumbnailer/Makefile.am
deleted file mode 100644
index 12e913649..000000000
--- a/src/tracker-thumbnailer/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-INCLUDES = \
- $(GLIB2_CFLAGS) \
- $(LIBPNG_CFLAGS) \
- -DLIBDIR=\""$(libdir)"\"
-
-libexec_PROGRAMS = tracker-thumbnailer
-
-tracker_thumbnailer_SOURCES = \
- tracker-thumbnailer.c
-
-tracker_thumbnailer_LDADD = \
- $(GLIB2_LIBS) \
- $(LIBPNG_LIBS)
diff --git a/src/tracker-thumbnailer/tracker-thumbnailer.c b/src/tracker-thumbnailer/tracker-thumbnailer.c
deleted file mode 100644
index 553e00f56..000000000
--- a/src/tracker-thumbnailer/tracker-thumbnailer.c
+++ /dev/null
@@ -1,388 +0,0 @@
-
-/* tracker-thumbnailer
- * Copyright (C) 2006, Edward Duffy <eduffy@gmail.com>
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <png.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#ifdef G_OS_WIN32
-#include <Windows.h>
-
-#define _fullpath_internal(res,path,size) \
- (GetFullPathName ((path), (size), (res), NULL) ? (res) : NULL)
-#define realpath(path,resolved_path) _fullpath_internal(resolved_path, path, MAX_PATH)
-#endif
-
-#ifndef LIBDIR
-#define LIBDIR "/usr/lib"
-#endif
-
-static gboolean
-create_thumbnails_dir (const gchar * const subdir)
-{
-
- gchar *thumbnails_dir = NULL;
- const gchar *home_dir;
-
- home_dir = g_get_home_dir ();
-
- thumbnails_dir = g_build_filename (home_dir, ".thumbnails", NULL);
-
- /* Ensure that ~/.thumbnails is not a file if it exists */
- if (g_file_test (thumbnails_dir, G_FILE_TEST_EXISTS) &&
- !g_file_test (thumbnails_dir, G_FILE_TEST_IS_DIR)) {
- g_printerr ("%s exists but is not a directory.\n", thumbnails_dir);
- g_free (thumbnails_dir);
- return FALSE;
- }
-
- g_free (thumbnails_dir);
-
- thumbnails_dir = g_build_filename (home_dir, ".thumbnails", subdir, NULL);
-
- if (g_mkdir_with_parents (thumbnails_dir, 00775) == -1) {
- g_printerr ("failed: g_mkdir_with_parents (%s)\n", thumbnails_dir);
- g_free (thumbnails_dir);
- return FALSE;
- }
-
- g_free (thumbnails_dir);
- return TRUE;
-
-}
-
-static gboolean
-valid_thumbnail_exists (const gchar *thumbnail_filename, const gchar *uri, const gchar *mtime)
-{
- FILE *fp;
- png_structp png_ptr;
- png_infop info_ptr;
- gint i, count, tests_passed;
- png_textp pngtext;
-
- if (g_file_test (thumbnail_filename, G_FILE_TEST_EXISTS)) {
-
- g_printerr ("%s exists ", thumbnail_filename);
-
- /* thumbnail exists; but is it valid? */
- g_assert ((fp = g_fopen (thumbnail_filename, "r")));
- g_assert ((png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)));
- g_assert ((info_ptr = png_create_info_struct (png_ptr)));
- png_init_io (png_ptr, fp);
- png_read_info (png_ptr, info_ptr);
- i = png_get_text (png_ptr, info_ptr, &pngtext, &count);
- tests_passed = 0;
- for (i = 0; i < count; i++) {
- if (strcmp (pngtext[i].key, "Thumb::URI") == 0 && strcmp (pngtext[i].text, uri) == 0) {
- ++tests_passed;
- }
- else if (strcmp (pngtext[i].key, "Thumb::MTime") == 0 && strcmp (pngtext[i].text, mtime) == 0) {
- ++tests_passed;
- }
- }
- fclose (fp);
-
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_read_struct (&png_ptr, NULL, NULL);
-
-
- if (tests_passed == 2) {
- g_printerr ("and it is valid\n");
- return TRUE;
- }
- g_printerr ("but it is not valid. Recreating thumbnail...\n");
- }
-
- return FALSE;
-}
-
-static gboolean
-generate_thumbnail (const gchar *filename, const gchar *thumbnail_filename, const gchar *mime, gint size)
-{
-
- gchar *thumbnailer;
- gchar *args[5];
- gint i;
- gboolean error = FALSE;
-
- /* do we have a thumbnailer for this mime type? */
- thumbnailer = g_strconcat (LIBDIR "/tracker/thumbnailers/",
- mime, "_thumbnailer", NULL);
-
- if (!g_file_test (thumbnailer, G_FILE_TEST_EXISTS)) {
- g_printerr ("Thumbnailer '%s' for mime %s not found\n", thumbnailer, mime);
- g_free (thumbnailer);
- return FALSE;
- }
-
- /* execute the thumbnailer */
- args[0] = g_strdup (thumbnailer);
- args[1] = g_filename_from_utf8 (filename, -1, NULL, NULL, NULL);
- args[2] = g_strdup (thumbnail_filename);
- args[3] = g_strdup_printf ("%d", size);
- args[4] = NULL;
-
- if (!g_spawn_sync (NULL, args, NULL,
- G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, NULL, NULL, NULL, NULL)) {
-
- g_printerr ("%s failed to create %s\n", thumbnailer, thumbnail_filename);
- g_remove (thumbnail_filename);
- error = TRUE;
- }
-
- for (i = 0; i < 4; i++) {
- g_free (args[i]);
- }
- g_free (thumbnailer);
-
- return !error;
-}
-
-
-static gboolean
-ensure_correct_thumbnail (const gchar *uri, const gchar *thumbnail_filename, const gchar *mtime) {
-
- FILE *fp;
- png_structp png_ptr;
- png_infop info_ptr;
- png_textp pngtext;
- png_uint_32 width, height;
- gint bit_depth, color_type, interlace_method;
- gint compression_method, filter_method;
- png_colorp palette = NULL;
- gint num_palette;
- png_bytepp row_pointers;
- guint i;
-
- /* the fd.o spec requires us to set certain PNG keys. As far as I can
- * see, libpng doesn't allow you to just set metadata, you have to do
- * that when you create the file. Therefore, we need to copy the newly
- * created thumbnail into a new one while setting the required attributes
- */
- g_assert ((fp = g_fopen (thumbnail_filename, "r")));
- g_assert ((png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)));
- g_assert ((info_ptr = png_create_info_struct (png_ptr)));
-
- if (setjmp (png_jmpbuf (png_ptr))) {
- g_printerr ("Error reading thumbnail\n");
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- fclose (fp);
- g_remove (thumbnail_filename);
- return FALSE;
- }
-
- png_init_io (png_ptr, fp);
- png_read_info (png_ptr, info_ptr);
-
- g_assert ((1 == png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_method, &compression_method, &filter_method)));
-
- png_get_PLTE (png_ptr, info_ptr, &palette, &num_palette);
-
- row_pointers = g_new (png_bytep, height);
- for (i = 0; i < height; i++) {
- row_pointers[i] = (png_bytep) g_malloc0 (png_get_rowbytes (png_ptr, info_ptr));
- }
- png_read_image (png_ptr, row_pointers);
- png_read_end (png_ptr, NULL);
-
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- fclose (fp);
-
- /* write the new thumbnail (overwrites the old) */
- g_assert ((fp = g_fopen (thumbnail_filename, "w")));
- g_assert ((png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)));
- g_assert ((info_ptr = png_create_info_struct (png_ptr)));
-
- if (setjmp (png_jmpbuf (png_ptr))) {
- g_printerr ("Error creating thumbnail\n");
- } else {
-
- png_init_io (png_ptr, fp);
-
- png_set_IHDR (png_ptr, info_ptr, width, height, bit_depth,
- color_type, interlace_method, compression_method, filter_method);
-
- if (palette && num_palette > 0)
- png_set_PLTE (png_ptr, info_ptr, palette, num_palette);
-
- /* set the required fields */
- pngtext = g_new0 (png_text, 3);
- pngtext[0].key = "Thumb::URI";
- pngtext[0].text = g_strdup (uri);
- pngtext[0].text_length = strlen (uri);
- pngtext[0].compression = PNG_TEXT_COMPRESSION_NONE;
- pngtext[1].key = "Thumb::MTime";
- pngtext[1].text = g_strdup (mtime);
- pngtext[1].text_length = strlen (mtime);
- pngtext[1].compression = PNG_TEXT_COMPRESSION_NONE;
- /* set some optional fields */
- pngtext[2].key = "Software";
- pngtext[2].text = "Tracker thumbnail factory";
- pngtext[2].compression = PNG_TEXT_COMPRESSION_NONE;
- png_set_text(png_ptr, info_ptr, pngtext, 3);
-
- png_write_info (png_ptr, info_ptr);
- png_write_image (png_ptr, row_pointers);
- png_write_end (png_ptr, info_ptr);
-
- g_free (pngtext[0].text);
- g_free (pngtext[1].text);
- g_free (pngtext);
- }
- fclose (fp);
-
- for (i = 0; i < height; i++) {
- g_free (row_pointers[i]);
- }
-
- g_free (row_pointers);
-
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_write_struct (&png_ptr, NULL);
-
- return TRUE;
-}
-
-static gboolean
-validate_args (gint argc, gchar **argv)
-{
- if (argc < 4) {
- return FALSE;
- }
-
- if (!strcmp (argv[3], "normal")
- || !strcmp (argv[3], "large")
- || !strcmp (argv[3], "preview")) {
- return TRUE;
- }
-
- return FALSE;
-}
-
-
-/* argv[1] == full path of file to be nailed
- * argv[2] == mime type of said file
- * argv[3] == requested size: "normal", "large", "preview"
- */
-
-gint
-main (gint argc, gchar *argv[])
-{
- gchar *uri;
- gchar realname[MAXPATHLEN];
- struct stat stat_info;
- gchar *mtime;
- gchar *uri_hash;
- GChecksum *checksum;
- gchar *thumbnail_filename;
-
- if (!validate_args (argc, argv)) {
- g_printerr ("Usage: ./tracker-thumbnailer filename mimetype [normal|large|preview]\n");
- return EXIT_FAILURE;
- }
-
- /* only make normal size thumbnails for now */
- if (strcmp (argv[3], "normal") != 0) {
- g_printerr ("Only normal sized thumbnails are supported\n");
- return EXIT_FAILURE;
- }
-
- if (!create_thumbnails_dir (argv[3]))
- return EXIT_FAILURE;
-
- /* make sure the actual file exists */
- if (!g_file_test (argv[1], G_FILE_TEST_EXISTS)) {
- g_printerr ("File '%s' does not exist\n", argv[1]);
- return EXIT_FAILURE;
- }
-
- /* g_filename_to_uri needs an absolute filename */
- if (!realpath (argv[1], realname)) {
- g_printerr("could not resolve absolute pathname for %s\n", argv[1]);
- return EXIT_FAILURE;
- }
-
- /* convert file name to URI */
- uri = g_filename_to_uri (realname, NULL, NULL);
-
-
- /* create path to thumbnail */
- checksum = g_checksum_new (G_CHECKSUM_MD5);
- g_checksum_update (checksum, (guchar *)uri, strlen (uri));
- uri_hash = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- g_checksum_free (checksum);
-
-
- thumbnail_filename = g_build_filename (g_get_home_dir (), ".thumbnails", argv[3], uri_hash, NULL);
- g_free (uri_hash);
-
- /* get stat information on the file */
- if (g_stat (argv[1], &stat_info) == -1) {
- g_printerr ("stat () failed for %s\n", argv[1]);
- g_free (thumbnail_filename);
- g_free (uri);
- return EXIT_FAILURE;
- }
- mtime = g_strdup_printf ("%lu", stat_info.st_mtime);
-
- /* check to see if the thumbnail already exists */
- if (valid_thumbnail_exists (thumbnail_filename, uri, mtime)) {
- g_print ("%s\n", thumbnail_filename);
- g_free (mtime);
- g_free (thumbnail_filename);
- g_free (uri);
- return EXIT_SUCCESS;
- }
-
- if (!generate_thumbnail (uri, thumbnail_filename, argv[2], 128)) {
- g_free (mtime);
- g_free (thumbnail_filename);
- g_free (uri);
- return EXIT_FAILURE;
- }
-
- if (g_file_test (thumbnail_filename, G_FILE_TEST_EXISTS)) {
- ensure_correct_thumbnail (uri, thumbnail_filename, mtime);
- } else {
- g_free (mtime);
- g_free (thumbnail_filename);
- g_free (uri);
- return EXIT_FAILURE;
- }
-
- /* if we get here, everything must have succeeded */
- g_print ("%s\n", thumbnail_filename);
- g_free (thumbnail_filename);
- g_free (uri);
- g_free (mtime);
- return EXIT_SUCCESS;
-}
diff --git a/thumbnailers/Makefile.am b/thumbnailers/Makefile.am
deleted file mode 100644
index e8174d1be..000000000
--- a/thumbnailers/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = application image
diff --git a/thumbnailers/application/Makefile.am b/thumbnailers/application/Makefile.am
deleted file mode 100644
index 1c9713f49..000000000
--- a/thumbnailers/application/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-thumbappbindir = $(libdir)/tracker/thumbnailers/application
-
-thumbappbin_SCRIPTS = pdf_thumbnailer \
- vnd.oasis.opendocument.graphics_thumbnailer \
- vnd.oasis.opendocument.presentation_thumbnailer \
- vnd.oasis.opendocument.spreadsheet_thumbnailer \
- vnd.oasis.opendocument.text_thumbnailer
-
-EXTRA_DIST = $(thumbappbin_SCRIPTS)
diff --git a/thumbnailers/application/pdf_thumbnailer b/thumbnailers/application/pdf_thumbnailer
deleted file mode 100755
index e7fb10149..000000000
--- a/thumbnailers/application/pdf_thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-nice -n19 evince-thumbnailer -s $3 "$1" $2
-
diff --git a/thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer b/thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer
deleted file mode 100755
index 392e6f77d..000000000
--- a/thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 unzip -p "$1" Thumbnails/thumbnail.png | convert - -resize $3x$3 "$2"
diff --git a/thumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer b/thumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer
deleted file mode 100755
index 392e6f77d..000000000
--- a/thumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 unzip -p "$1" Thumbnails/thumbnail.png | convert - -resize $3x$3 "$2"
diff --git a/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer b/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer
deleted file mode 100755
index 392e6f77d..000000000
--- a/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 unzip -p "$1" Thumbnails/thumbnail.png | convert - -resize $3x$3 "$2"
diff --git a/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer b/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer
deleted file mode 100755
index 392e6f77d..000000000
--- a/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 unzip -p "$1" Thumbnails/thumbnail.png | convert - -resize $3x$3 "$2"
diff --git a/thumbnailers/image/Makefile.am b/thumbnailers/image/Makefile.am
deleted file mode 100644
index 01cf26b46..000000000
--- a/thumbnailers/image/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
diff --git a/thumbnailers/image/gif_thumbnailer b/thumbnailers/image/gif_thumbnailer
deleted file mode 100755
index 70c05f15f..000000000
--- a/thumbnailers/image/gif_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 convert "$1" -thumbnail $3x$3 $2
diff --git a/thumbnailers/image/hildon/gif_thumbnailer b/thumbnailers/image/hildon/gif_thumbnailer
deleted file mode 100755
index df27fc705..000000000
--- a/thumbnailers/image/hildon/gif_thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/gif $2 0 $3 $3
-
diff --git a/thumbnailers/image/hildon/jpeg_thumbnailer b/thumbnailers/image/hildon/jpeg_thumbnailer
deleted file mode 100755
index e16217d7b..000000000
--- a/thumbnailers/image/hildon/jpeg_thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/jpeg $2 0 $3 $3
-
diff --git a/thumbnailers/image/hildon/png_thumbnailer b/thumbnailers/image/hildon/png_thumbnailer
deleted file mode 100755
index b9f5f10f8..000000000
--- a/thumbnailers/image/hildon/png_thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/png $2 0 $3 $3
-
diff --git a/thumbnailers/image/hildon/tiff_thumbnailer b/thumbnailers/image/hildon/tiff_thumbnailer
deleted file mode 100755
index 063970a24..000000000
--- a/thumbnailers/image/hildon/tiff_thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/tiff $2 0 $3 $3
-
diff --git a/thumbnailers/image/jpeg_thumbnailer b/thumbnailers/image/jpeg_thumbnailer
deleted file mode 100755
index 70c05f15f..000000000
--- a/thumbnailers/image/jpeg_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 convert "$1" -thumbnail $3x$3 $2
diff --git a/thumbnailers/image/png_thumbnailer b/thumbnailers/image/png_thumbnailer
deleted file mode 100755
index 70c05f15f..000000000
--- a/thumbnailers/image/png_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 convert "$1" -thumbnail $3x$3 $2
diff --git a/thumbnailers/image/tiff_thumbnailer b/thumbnailers/image/tiff_thumbnailer
deleted file mode 100755
index 70c05f15f..000000000
--- a/thumbnailers/image/tiff_thumbnailer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nice -n19 convert "$1" -thumbnail $3x$3 $2