diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-multipart.c | 4 | ||||
| -rw-r--r-- | camel/camel-seekable-substream.c | 4 | ||||
| -rw-r--r-- | camel/camel-seekable-substream.h | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index c8cebe07d1..f04c228db4 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,11 @@ 2000-03-28 Dan Winship <danw@helixcode.com> + * camel-seekable-substream.c + (camel_seekable_substream_new_with_seekable_stream_and_bounds): + make this return a CamelStream rather than a + CamelSeekableSubstream, because that's the way Gtk objects tend to + work. + * camel-service.c (camel_service_gethost, camel_service_getport): convenience functions to canonicalize the host and port values of a service's URL. diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c index f6bde0e496..f20d6ae26d 100644 --- a/camel/camel-multipart.c +++ b/camel/camel-multipart.c @@ -558,10 +558,10 @@ my_set_input_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) real_boundary_line, end_boundary_line, &part_end); - body_part_input_stream = + body_part_input_stream = CAMEL_SEEKABLE_SUBSTREAM ( camel_seekable_substream_new_with_seekable_stream_and_bounds (seekable_stream, part_begining, - part_end); + part_end)); CAMEL_LOG_FULL_DEBUG ("CamelMultipart::set_input_stream, use a substream,\n" "\tbegining = %d\n" "\tend = %d\n",part_begining, part_end); diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c index 321783b306..16b2f56e08 100644 --- a/camel/camel-seekable-substream.c +++ b/camel/camel-seekable-substream.c @@ -231,7 +231,7 @@ _init_with_seekable_stream_and_bounds (CamelSeekableSubstream *seekable_substre -CamelSeekableSubstream * +CamelStream * camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream *parent_stream, guint32 inf_bound, gint64 sup_bound) @@ -246,7 +246,7 @@ camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStrea parent_stream, inf_bound, sup_bound); - return seekable_substream; + return CAMEL_STREAM (seekable_substream); } diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h index e34a67ee92..72f04601c8 100644 --- a/camel/camel-seekable-substream.h +++ b/camel/camel-seekable-substream.h @@ -83,7 +83,7 @@ GtkType camel_seekable_substream_get_type (void); /* public methods */ /* obtain a new seekable substream */ -CamelSeekableSubstream * +CamelStream * camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream *parent_stream, guint32 inf_bound, gint64 sup_bound); |