diff options
Diffstat (limited to 'composer/e-msg-composer.c')
| -rw-r--r-- | composer/e-msg-composer.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 11b64a7ff9..f2ef200219 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1,28 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-msg-composer.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * published by the Free Software Foundation; either version 2 of the - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. * * Authors: - * Ettore Perazzoli (ettore@ximian.com) - * Jeffrey Stedfast (fejj@ximian.com) - * Miguel de Icaza (miguel@ximian.com) - * Radek Doulik (rodo@ximian.com) + * Ettore Perazzoli (ettore@ximian.com) + * Jeffrey Stedfast (fejj@ximian.com) + * Miguel de Icaza (miguel@ximian.com) + * Radek Doulik (rodo@ximian.com) + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -3969,7 +3966,7 @@ handle_uri (EMsgComposer *composer, return; if (!g_ascii_strcasecmp (url->protocol, "file")) { - type = e_util_guess_mime_type (uri + strlen ("file://")); + type = e_util_guess_mime_type (uri + strlen ("file://"), TRUE); if (!type) return; @@ -4201,7 +4198,7 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer, camel_data_wrapper_construct_from_stream (wrapper, stream); camel_object_unref (CAMEL_OBJECT (stream)); - mime_type = e_util_guess_mime_type (dec_file_name); + mime_type = e_util_guess_mime_type (dec_file_name, TRUE); if (mime_type == NULL) mime_type = g_strdup ("application/octet-stream"); camel_data_wrapper_set_mime_type (wrapper, mime_type); |