aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-10-01 20:29:46 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-10-01 20:29:46 +0800
commit77ff19dd8394167cdc9765af20a62bdaed18e308 (patch)
treecbc6da9a817aad2d87acab9199a37a69a08851bf /widgets
parent11fd4c56d352e7e25cd95cf083b071e982cf42ba (diff)
downloadgsoc2013-evolution-77ff19dd8394167cdc9765af20a62bdaed18e308.tar.gz
gsoc2013-evolution-77ff19dd8394167cdc9765af20a62bdaed18e308.tar.zst
gsoc2013-evolution-77ff19dd8394167cdc9765af20a62bdaed18e308.zip
** Fix for bug #554418
2008-10-01 Milan Crha <mcrha@redhat.com> ** Fix for bug #554418 * e-util/e-util.h: (e_util_guess_mime_type): * e-util/e-util.c: (e_util_guess_mime_type): Guess mime_type based on the file content only when permitted by the caller, otherwise check based on the filename only, where it fallbacks if file content guess fails. * mail/em-utils.c: (em_utils_snoop_type): * mail/em-popup.c: (emp_standard_menu_factory): Guess mime_type based on the filename only. * composer/e-msg-composer.c: (handle_uri), (e_msg_composer_add_inline_image_from_file): Guess mime_type based on the file content, if failed, then on the filename. * widgets/misc/e-attachment.c: (attachment_guess_mime_type): Allow guessing mime_type based on the file content. * calendar/gui/dialogs/comp-editor.c: (set_attachment_list): * calendar/gui/e-cal-popup.c: (ecalp_standard_menu_factory): Allow/disallow guessing of the mime_type based on the file content. svn path=/trunk/; revision=36529
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-attachment.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index e2dc720101..57e1d25b7a 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-01 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #554418
+
+ * e-attachment.c: (attachment_guess_mime_type):
+ Allow guessing mime_type based on the file content.
+
2008-10-01 Sankar P <psankar@novell.com>
License Changes
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 073110571a..4f5e9ace34 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -229,8 +229,7 @@ attachment_guess_mime_type (const char *file_name)
char *type;
gchar *content = NULL;
- type = e_util_guess_mime_type (file_name);
-
+ type = e_util_guess_mime_type (file_name, TRUE);
if (type && strcmp (type, "text/directory") == 0 &&
file_ext_is (file_name, ".vcf") &&