diff options
| author | bertrand <Bertrand.Guiheneuf@aful.org> | 2000-02-22 16:13:34 +0800 |
|---|---|---|
| committer | Bertrand Guiheneuf <bertrand@src.gnome.org> | 2000-02-22 16:13:34 +0800 |
| commit | 6b21505b40126e00636603c705b771e5c857beef (patch) | |
| tree | 10fe4552acfa8cb61a1a1972a723eaefff30b110 | |
| parent | 4cd6866203afabc052140bbd5a6823483b017534 (diff) | |
| download | gsoc2013-evolution-6b21505b40126e00636603c705b771e5c857beef.tar.gz gsoc2013-evolution-6b21505b40126e00636603c705b771e5c857beef.tar.zst gsoc2013-evolution-6b21505b40126e00636603c705b771e5c857beef.zip | |
added a reset method. Thanks message-browser to find so much bugs :)
2000-02-22 bertrand <Bertrand.Guiheneuf@aful.org>
* camel-stream-b64.c (reset__static): added a
reset method. Thanks message-browser to find
so much bugs :)
* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd
Unicode libs.
* shell/Makefile.am (evolution_LDADD):
add libetext.a.
Fixes.
svn path=/trunk/; revision=1900
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | camel/ChangeLog | 9 | ||||
| -rw-r--r-- | camel/camel-stream-b64.c | 25 | ||||
| -rw-r--r-- | camel/providers/mbox/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/Makefile.am | 1 |
5 files changed, 39 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2000-02-22 bertrand <Bertrand.Guiheneuf@aful.org> + + * shell/Makefile.am (evolution_LDADD): + add libetext.a. + 2000-02-21 Matt Loper <matt@helixcode.com> * tests/ui-tests/message-browser.c (on_link_clicked): stop diff --git a/camel/ChangeLog b/camel/ChangeLog index fe9cac7d0e..96d6de92d9 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,12 @@ +2000-02-22 bertrand <Bertrand.Guiheneuf@aful.org> + + * camel-stream-b64.c (reset__static): added a + reset method. Thanks message-browser to find + so much bugs :) + + * providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd + Unicode libs. + 2000-02-21 bertrand <Bertrand.Guiheneuf@aful.org> * camel-formatter.c (lookup_unique_id): diff --git a/camel/camel-stream-b64.c b/camel/camel-stream-b64.c index f43e89d982..f2155a2c95 100644 --- a/camel/camel-stream-b64.c +++ b/camel/camel-stream-b64.c @@ -80,6 +80,8 @@ static gint read__static (CamelStream *strea gchar *buffer, gint n); +static void reset__static (CamelStream *stream); + static gint read_decode__static (CamelStream *stream, gchar *buffer, gint n); @@ -98,8 +100,9 @@ camel_stream_b64_class_init (CamelStreamB64Class *camel_stream_b64_class) /* virtual method overload */ - camel_stream_class->read = read__static; - camel_stream_class->eos = eos__static; + camel_stream_class->read = read__static; + camel_stream_class->eos = eos__static; + camel_stream_class->reset = reset__static; /* signal definition */ @@ -303,3 +306,21 @@ eos__static (CamelStream *stream) return (stream_b64->eos || camel_stream_eos (stream_b64->input_stream)); } + + + + + +static void +reset__static (CamelStream *stream) +{ + CamelStreamB64 *stream_b64 = CAMEL_STREAM_B64 (stream); + + g_assert (stream); + g_assert (stream_b64->input_stream); + + stream_b64->decode_status.keep = 0; + stream_b64->decode_status.state = 0; + + camel_stream_reset (stream_b64->input_stream); +} diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am index d999f4a21e..f3d80606ae 100644 --- a/camel/providers/mbox/Makefile.am +++ b/camel/providers/mbox/Makefile.am @@ -35,6 +35,6 @@ libcamelmboxinclude_HEADERS = \ libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -libcamelmbox_la_LIBADD = $(top_builddir)/filter/libfilter.la $(top_builddir)/libibex/libibex.la +libcamelmbox_la_LIBADD = $(top_builddir)/filter/libfilter.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS) EXTRA_DIST = diff --git a/shell/Makefile.am b/shell/Makefile.am index 7125c41512..dc568fc2bd 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -39,6 +39,7 @@ $(EVOLUTION_CORBA_GENERATED): Evolution.idl evolution_LDADD = \ ../widgets/shortcut-bar/libshortcut-bar.a \ + ../widgets/e-text/libetext.a \ ../e-util/libeutil.a \ $(BONOBO_GNOME_LIBS) |