diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 20 | ||||
| -rw-r--r-- | camel/camel-mime-part-utils.c | 2 | ||||
| -rw-r--r-- | camel/providers/mbox/camel-mbox-utils.c | 5 |
3 files changed, 23 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index d781b197d5..5aaf1953a8 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,22 @@ +2000-03-03 NotZed <NotZed@HelixCode.com> + + * providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Make + sure we open with create with a creation mask. + +2000-03-01 NotZed <NotZed@HelixCode.com> + + * camel-mime-part-utils.c + (camel_mime_part_construct_content_from_stream): DO NOT assert on + content type, we have fallback code 4 lines below it ... *sigh* + +2000-02-29 NotZed <NotZed@HelixCode.com> + + * Makefile.am (libcamelinclude_HEADERS): Added camel-stream-buffer + to build. + + * camel-stream-buffer.[ch]: Generic buffer which can be applied to + any stream. + 2000-03-03 bertrand <bertrand@helixcode.com> * camel-formatter.c (handle_image): in the case @@ -79,6 +98,7 @@ Initialise end_of_last_message always. (camel_mbox_copy_file_chunk): Stop trying to read if we run out of data, rather than looping forever. + (camel_mbox_write_xev): Use an open flag when opening with create. * camel-folder.c (camel_folder_search_by_expression): No, its not a fatal error to search on a non-searchable folder, you just dont diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index fe3c175cb3..8976230cdc 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -97,7 +97,6 @@ camel_mime_part_construct_content_from_stream (CamelMimePart *mime_part, content_type = camel_mime_part_get_content_type (mime_part); /* here we should have a mime type */ - g_assert (content_type); if (content_type) mime_type = gmime_content_field_get_mime_type (content_type); @@ -119,7 +118,6 @@ camel_mime_part_construct_content_from_stream (CamelMimePart *mime_part, */ content_object_type = data_wrapper_repository_get_data_wrapper_type (mime_type); - CAMEL_LOG_FULL_DEBUG ("CamelMimePartUtils::construct_content_from_stream content" " type object type used: %s\n", gtk_type_name (content_object_type)); diff --git a/camel/providers/mbox/camel-mbox-utils.c b/camel/providers/mbox/camel-mbox-utils.c index 3d45daa05f..aa2d19a079 100644 --- a/camel/providers/mbox/camel-mbox-utils.c +++ b/camel/providers/mbox/camel-mbox-utils.c @@ -176,7 +176,8 @@ camel_mbox_copy_file_chunk (gint fd_src, do { nb_read = read (fd_src, buffer, MIN (1000, nb_to_read)); } while (nb_read == -1 && errno == EINTR); - + + if (nb_read == -1) { camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION, @@ -237,7 +238,7 @@ camel_mbox_write_xev (gchar *mbox_file_name, fd1 = open (mbox_file_name, O_RDONLY); fd2 = open (tmp_file_name, O_WRONLY | O_CREAT | O_TRUNC , - S_IRUSR | S_IWUSR); + S_IRUSR | S_IWUSR, 0600); if (fd2 == -1) { camel_exception_setv (ex, |