Changeset 3594

Show
Ignore:
Timestamp:
04/16/08 21:23:16
Author:
jdapena
Message:

* libtinymail-camel/tny-camel-mime-part.c

(tny_camel_get_decoded_stream_default): now we detect errors getting
the decoded stream from camel.
* libtinymail-gnomevfs/tny-vfs-stream.c (tny_vfs_stream_read):
return -1 if there was an error reading from the vfs stream.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3592 r3594  
     12008-04-16  José Dapena Paz  <jdapena@igalia.com> 
     2 
     3        * libtinymail-camel/tny-camel-mime-part.c 
     4        (tny_camel_get_decoded_stream_default): now we detect errors getting 
     5        the decoded stream from camel. 
     6        * libtinymail-gnomevfs/tny-vfs-stream.c (tny_vfs_stream_read): 
     7        return -1 if there was an error reading from the vfs stream. 
     8 
    192008-04-15  Philip Van Hoof <pvanhoof@gnome.org> 
    210 

  • trunk/libtinymail-camel/tny-camel-mime-part.c

    r3553 r3594  
    926926        CamelMedium *medium; 
    927927        CamelStream *stream = camel_stream_mem_new (); 
     928        gssize bytes = -1; 
    928929 
    929930        g_mutex_lock (priv->part_lock); 
    …… 
    944945 
    945946                if (camel_content_type_is (wrapper->mime_type, "text", "*")) 
    946                         camel_stream_format_text (wrapper, stream); 
     947                        bytes = camel_stream_format_text (wrapper, stream); 
    947948                else 
    948                         camel_data_wrapper_decode_to_stream (wrapper, stream); 
    949         } 
    950  
    951         retval = TNY_STREAM (tny_camel_stream_new (stream)); 
     949                        bytes = camel_data_wrapper_decode_to_stream (wrapper, stream); 
     950        } 
     951 
     952        if (bytes >= 0) { 
     953                retval = TNY_STREAM (tny_camel_stream_new (stream)); 
     954                tny_stream_reset (retval); 
     955        } 
     956 
    952957        camel_object_unref (stream); 
    953  
    954         tny_stream_reset (retval); 
    955958        camel_object_unref (medium); 
    956959 

  • trunk/libtinymail-gnomevfs/tny-vfs-stream.c

    r3531 r3594  
    179179                priv->position += nread; 
    180180        else {  
    181                 if (nread == 0) 
     181                if ((result != GNOME_VFS_OK) && (result != GNOME_VFS_ERROR_EOF)) 
     182                        nread = -1; 
     183                else if (nread == 0) 
    182184                        priv->eos = TRUE; 
    183185                tny_vfs_stream_set_errno (result);