From: Colin Leroy <colin@colino.net>
Date: Fri, 28 Dec 2007 18:56:01 +0000 (+0000)
Subject: 2007-12-28 [colin]	3.2.0cvs20
X-Git-Tag: rel_3_3_0~59
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7d64be287bd23a703c6f995e6a11b80e6e7a57e9

2007-12-28 [colin]	3.2.0cvs20

	* src/procmime.c
		Fix path to mime/globs. Patch by Marten King.
---

diff --git a/ChangeLog b/ChangeLog
index 74614ae53..2125a63bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-28 [colin]	3.2.0cvs20
+
+	* src/procmime.c
+		Fix path to mime/globs. Patch by Marten King.
+
 2007-12-27 [colin]	3.2.0cvs19
 
 	* src/plugins/pgpcore/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
index d23594ed2..3d2a2e3c8 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3156,3 +3156,4 @@
 ( cvs diff -u -r 1.115.2.178 -r 1.115.2.179 src/main.c;  cvs diff -u -r 1.274.2.225 -r 1.274.2.226 src/mainwindow.c;  cvs diff -u -r 1.204.2.159 -r 1.204.2.160 src/prefs_common.c;  cvs diff -u -r 1.103.2.103 -r 1.103.2.104 src/prefs_common.h;  ) > 3.2.0cvs17.patchset
 ( cvs diff -u -r 1.274.2.226 -r 1.274.2.227 src/mainwindow.c;  ) > 3.2.0cvs18.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpmime/Makefile.am;  ) > 3.2.0cvs19.patchset
+( cvs diff -u -r 1.49.2.104 -r 1.49.2.105 src/procmime.c;  ) > 3.2.0cvs20.patchset
diff --git a/configure.ac b/configure.ac
index 7f75f503b..e8371ed5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmime.c b/src/procmime.c
index 79cfeaeaa..49f41e68d 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1055,7 +1055,7 @@ GList *procmime_get_mime_type_list(void)
 	if (mime_type_list) 
 		return mime_type_list;
 	
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 	if ((fp = g_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) 
 #else
 	if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL)