From a8dd8ec8af07826434cf28bca75b5261528f806d Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Thu, 9 Mar 2006 06:50:05 +0000
Subject: parse ~/.mailcap if ~/.sylpheed-2.0/mailcap not found.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1037 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog           | 5 +++++
 ChangeLog.ja        | 6 ++++++
 libsylph/procmime.c | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 300c8dc4..c33bb442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-09
+
+	* libsylph/procmime.c: procmime_execute_open_file(): parse ~/.mailcap
+	  if ~/.sylpheed-2.0/mailcap not found.
+
 2006-03-09
 
 	* libsylph/utils.[ch]
diff --git a/ChangeLog.ja b/ChangeLog.ja
index bc330494..640d2b53 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2006-03-09
+
+	* libsylph/procmime.c: procmime_execute_open_file():
+	  ~/.sylpheed-2.0/mailcap が見つからなければ ~/.mailcap をパースする
+	  ようにした。
+
 2006-03-09
 
 	* libsylph/utils.[ch]
diff --git a/libsylph/procmime.c b/libsylph/procmime.c
index 349bd84f..8ff1b722 100644
--- a/libsylph/procmime.c
+++ b/libsylph/procmime.c
@@ -1281,6 +1281,12 @@ gint procmime_execute_open_file(const gchar *file, const gchar *mime_type)
 		list = procmime_parse_mailcap(path);
 		g_free(path);
 #else
+		if (!mailcap_list) {
+			path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+					   ".mailcap", NULL);
+			mailcap_list = procmime_parse_mailcap(path);
+			g_free(path);
+		}
 		list = procmime_parse_mailcap(SYSCONFDIR "/mailcap");
 		if (!list)
 			list = procmime_parse_mailcap("/etc/mailcap");
-- 
cgit v1.2.3