diff options
Diffstat (limited to 'e-util/e-signature-utils.c')
| -rw-r--r-- | e-util/e-signature-utils.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c index b28c0cb985..6a8258cb88 100644 --- a/e-util/e-signature-utils.c +++ b/e-util/e-signature-utils.c @@ -20,14 +20,9 @@ #include "e-signature-utils.h" #include <errno.h> +#include <camel/camel.h> #include <glib/gstdio.h> #include <gconf/gconf-client.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-mime-filter-charset.h> -#include <camel/camel-mime-filter-tohtml.h> #ifndef G_OS_WIN32 #include <sys/wait.h> @@ -176,13 +171,13 @@ e_read_signature_file (ESignature *signature, input_stream = camel_stream_fs_new_with_fd (fd); if (!is_html && convert_to_html) { - CamelStreamFilter *filtered_stream; + CamelStream *filtered_stream; CamelMimeFilter *filter; gint32 flags; filtered_stream = - camel_stream_filter_new_with_stream (input_stream); - camel_object_unref (input_stream); + camel_stream_filter_new (input_stream); + g_object_unref (input_stream); flags = CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT | @@ -190,10 +185,11 @@ e_read_signature_file (ESignature *signature, CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES; filter = camel_mime_filter_tohtml_new (flags, 0); - camel_stream_filter_add (filtered_stream, filter); - camel_object_unref (filter); + camel_stream_filter_add ( + CAMEL_STREAM_FILTER (filtered_stream), filter); + g_object_unref (filter); - input_stream = (CamelStream *) filtered_stream; + input_stream = filtered_stream; } buffer = g_byte_array_new (); @@ -201,8 +197,8 @@ e_read_signature_file (ESignature *signature, camel_stream_mem_set_byte_array ( CAMEL_STREAM_MEM (output_stream), buffer); camel_stream_write_to_stream (input_stream, output_stream); - camel_object_unref (output_stream); - camel_object_unref (input_stream); + g_object_unref (output_stream); + g_object_unref (input_stream); /* Make sure the buffer is nul-terminated. */ length = (gsize) buffer->len; @@ -295,9 +291,9 @@ e_run_signature_script (const gchar *filename) input_stream = camel_stream_fs_new_with_fd (in_fds[0]); camel_stream_write_to_stream (input_stream, output_stream); - camel_object_unref (input_stream); + g_object_unref (input_stream); - camel_object_unref (output_stream); + g_object_unref (output_stream); /* Make sure the buffer is nul-terminated. */ length = (gsize) buffer->len; |