From d41561638a533c88d764fade92560dc7ba56fb97 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 6 Jun 2011 14:05:09 +0200
Subject: [PATCH] properly handle bmp xpm and xcf. Closes issue #63

---
 src/sampleconf/mimeconf | 7 +++++++
 src/sampleconf/mimemap  | 4 +++-
 src/sampleconf/mimeview | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf
index 6521d3d6..7685489e 100644
--- a/src/sampleconf/mimeconf
+++ b/src/sampleconf/mimeconf
@@ -91,6 +91,7 @@ image/png = execm rclimg
 image/tiff = execm rclimg
 image/vnd.djvu = exec rcldjvu
 image/svg+xml = exec rclsvg
+image/x-xcf = execm rclimg
 message/rfc822 = internal
 text/calendar = execm rclics;mimetype=text/plain;charset=utf-8
 text/html  = internal 
@@ -157,12 +158,15 @@ application/x-perl = source
 application/x-shellscript = source
 audio/mpeg = sownd
 audio/x-karaoke = sownd
+image/bmp = image
 image/gif = image
 image/jpeg = image
 image/png = image
 image/tiff = image
 image/vnd.djvu = document
 image/svg+xml = drawing
+image/x-xcf = image
+image/x-xpmi = image
 message/rfc822 = message
 text/html = html
 text/plain = txt
@@ -241,6 +245,9 @@ media = \
       image/png \
       image/svg+xml \
       image/tiff \
+      image/x-xcf \
+      image/bmp \
+      image/x-xpmi \
       video/mp2p \
       video/mp2t \
       video/mp4 \
diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap
index 6bfdcd72..821e1bcc 100644
--- a/src/sampleconf/mimemap
+++ b/src/sampleconf/mimemap
@@ -109,6 +109,9 @@
 .gif = image/gif
 .tiff = image/tiff
 .tif  = image/tiff
+.xcf  = image/x-xcf
+.bmp = image/bmp
+.xpm = image/x-xpmi
 
 .fb2 = text/x-fictionbook
 
@@ -126,7 +129,6 @@ recoll_noindex = .tar.gz .tgz .tar.bz2 .tbz .log.gz .md5 .map \
        .o .lib .dll .a \
        .dat .bak .rdf .log .db .msf .pid \
        .gnm .gnumeric \
-       .gif .bmp .xpm \
        ,v ~ #
 
 # Special handling of .txt files inside ~/.gaim and ~/.purple directories
diff --git a/src/sampleconf/mimeview b/src/sampleconf/mimeview
index 6bc89d26..5f5e7ec4 100644
--- a/src/sampleconf/mimeview
+++ b/src/sampleconf/mimeview
@@ -65,6 +65,10 @@ image/tiff = gwenview %f
 image/gif  = gwenview %f
 image/svg+xml = inkview %f
 image/vnd.djvu = djview %f
+image/x-xcf = gimp %f
+image/bmp = gwenview %f
+image/x-ms-bmp = gwenview %f
+image/x-xpmi = gwenview %f
 
 # Or firefox -remote "openFile(%u)"
 application/x-tex = gnuclient -q %f