Changeset 3246

Show
Ignore:
Timestamp:
01/12/08 16:50:32
Author:
pvanhoof
Message:

Further merged with camel upstream

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3244 r3246  
    112008-01-12  Philip Van Hoof <pvanhoof@gnome.org> 
    22 
    3         * Merged camel-lite with Camel upstream rev. 835 
     3        * Merged camel-lite with Camel upstream rev. 8360 
    44        * Added an extra check around a strcmp that seems to have caused a  
    55        crash once 

  • trunk/libtinymail-camel/camel-lite/ChangeLog

    r3239 r3246  
    552008-01-12  Philip Van Hoof <pvanhoof@gnome.org> 
    66 
    7         * Merged with Camel upstream rev. 8358 
     7        * Merged with Camel upstream rev. 8360 
    88 
    992007-12-24  Philip Van Hoof <pvanhoof@gnome.org> 

  • trunk/libtinymail-camel/camel-lite/camel/camel-mime-filter-tohtml.c

    r2950 r3246  
    276276                while (inptr < inend && *inptr != '\n') 
    277277                        inptr++; 
    278  
     278                 
    279279                if (inptr >= inend && !flush) 
    280280                        break; 
    281  
     281                 
    282282                html->column = 0; 
    283283                depth = 0; 

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

    r3239 r3246  
    10881088        dw = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)); 
    10891089         
    1090         null = camel_stream_null_new (); 
    1091         camel_data_wrapper_decode_to_stream (dw, null); 
     1090        null = (CamelStreamNull *) camel_stream_null_new (); 
     1091        camel_data_wrapper_decode_to_stream (dw, (CamelStream *) null); 
    10921092        size = null->written; 
    10931093