diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-05 05:40:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-09 02:37:52 +0800 |
| commit | 137b0743ddfbd3bbc01c9813615ede91ddd9b954 (patch) | |
| tree | 1d8e09ba0239eff419d432bdd8d5b521fbb727ba /widgets | |
| parent | 36f1f29b9a42c56a619e031b045db5a18f2b1dd7 (diff) | |
| download | gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.gz gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.bz2 gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.lz gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.xz gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.zst gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.zip | |
Migrate from CamelException to GError.
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/e-account-combo-box.c | 5 | ||||
| -rw-r--r-- | widgets/misc/e-attachment.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index 7d34a29bfe..e2306baae1 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -107,7 +107,6 @@ static gboolean account_combo_box_test_account (EAccount *account) { CamelStore *store; - CamelException ex; const gchar *url; gboolean writable = FALSE; @@ -124,15 +123,13 @@ account_combo_box_test_account (EAccount *account) return TRUE; /* Account must be writable. */ - camel_exception_init (&ex); url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL); store = CAMEL_STORE (camel_session_get_service ( - camel_session, url, CAMEL_PROVIDER_STORE, &ex)); + camel_session, url, CAMEL_PROVIDER_STORE, NULL)); if (store != NULL) { writable = (store->mode & CAMEL_STORE_WRITE); g_object_unref (store); } - camel_exception_clear (&ex); return writable; } diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 1872de6b77..56659ae01c 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -1080,7 +1080,7 @@ e_attachment_add_to_multipart (EAttachment *attachment, CAMEL_STREAM_FILTER (filtered_stream), CAMEL_MIME_FILTER (filter)); camel_data_wrapper_decode_to_stream ( - wrapper, filtered_stream); + wrapper, filtered_stream, NULL); g_object_unref (filtered_stream); g_object_unref (stream); @@ -1563,9 +1563,9 @@ attachment_load_finish (LoadContext *load_context) size = g_memory_output_stream_get_data_size (output_stream); stream = camel_stream_mem_new_with_buffer (data, size); - camel_data_wrapper_construct_from_stream (wrapper, stream); + camel_data_wrapper_construct_from_stream (wrapper, stream, NULL); camel_data_wrapper_set_mime_type (wrapper, mime_type); - camel_stream_close (stream); + camel_stream_close (stream, NULL); g_object_unref (stream); mime_part = camel_mime_part_new (); @@ -2498,7 +2498,7 @@ attachment_save_got_output_stream (SaveContext *save_context) stream = camel_stream_mem_new (); camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer); wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part)); - camel_data_wrapper_decode_to_stream (wrapper, stream); + camel_data_wrapper_decode_to_stream (wrapper, stream, NULL); g_object_unref (stream); /* Load the buffer into a GMemoryInputStream. |