diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 28 | ||||
| -rw-r--r-- | composer/e-composer-actions.c | 4 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 35 | ||||
| -rw-r--r-- | composer/mail-composer.error.xml | 2 |
4 files changed, 47 insertions, 22 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 7afbe38079..0e5a3dd328 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,31 @@ +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #554418 + + * 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. + +2008-09-29 Sankar P <psankar@novell.com> + +License Changes + + * e-msg-composer.c: + +2008-09-25 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #553148 + + * mail-composer.error.xml: Standardise "GroupWise" usage in + translatable strings. + +2008-09-23 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #553273 + + * e-composer-actions.c: (action_save_cb): + Always end e_error_run/e_error_new calls with NULL parameter. + 2008-09-10 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #551548 diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 3146d9614b..c88f7e301e 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -246,7 +246,7 @@ action_save_cb (GtkAction *action, e_error_run ( GTK_WINDOW (composer), E_ERROR_NO_SAVE_FILE, filename, - g_strerror (errno_saved)); + g_strerror (errno_saved), NULL); return; } } else @@ -256,7 +256,7 @@ action_save_cb (GtkAction *action, e_error_run ( GTK_WINDOW (composer), E_ERROR_NO_SAVE_FILE, - filename, error->message); + filename, error->message, NULL); g_error_free (error); return; } 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); diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml index 6f76887bc8..a13fe34054 100644 --- a/composer/mail-composer.error.xml +++ b/composer/mail-composer.error.xml @@ -79,6 +79,6 @@ Please make sure that you have the correct version of gtkhtml and libgtkhtml ins <error id="send-options-support" type="error" modal="true"> <_primary>Send options not available.</_primary> - <_secondary>Send options available only for Novell Groupwise and Microsoft Exchange accounts.</_secondary> + <_secondary>Send options available only for Novell GroupWise and Microsoft Exchange accounts.</_secondary> </error> </error-list> |