diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-11-07 09:19:27 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-11-07 09:19:27 +0800 |
| commit | 66b85f364e12a4c94faccb08906b48a9ac1452f5 (patch) | |
| tree | bb28b0edcc699d3e7ae4397cd42775212eccbd23 | |
| parent | 1359e56e8435dfbce8dc5c5bfc7a3d3b65e4e3e1 (diff) | |
| download | gsoc2013-evolution-66b85f364e12a4c94faccb08906b48a9ac1452f5.tar.gz gsoc2013-evolution-66b85f364e12a4c94faccb08906b48a9ac1452f5.tar.zst gsoc2013-evolution-66b85f364e12a4c94faccb08906b48a9ac1452f5.zip | |
Two segfault fixes
svn path=/trunk/; revision=6472
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 2 | ||||
| -rw-r--r-- | composer/ChangeLog | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 1c413b0ab0..c0e4ae2b38 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -155,6 +155,11 @@ * camel-mime-filter-basic.c (filter, complete): Update for base64 api change. +2000-10-30 Peter Williams <peterw@helixcode.com> + + * providers/imap/camel-imap-store.c (unsubscribe_folder): Correct + parameters to g_hash_table_lookup_extended. + 2000-10-29 Dan Winship <danw@helixcode.com> Improved IMAP namespace handling: leave the namespace in the diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 0a8618ff90..7d87a9263e 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -769,7 +769,7 @@ unsubscribe_folder (CamelStore *store, const char *folder_name, "UNSUBSCRIBE \"%s\"", folder_name); if (response) { g_hash_table_lookup_extended (imap_store->subscribed_folders, - folder_name, key, value); + folder_name, &key, &value); g_hash_table_remove (imap_store->subscribed_folders, folder_name); g_free (key); diff --git a/composer/ChangeLog b/composer/ChangeLog index a64ac15f41..057fcc3054 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -42,6 +42,12 @@ * Makefile.am: Clean the idl-generated files properly. +2000-11-02 Peter Williams <peterw@helixcode.com> + + * e-msg-composer-attachment-bar.c (attach_to_multipart): CamelStreamMem + steals our byte array; we can't destroy the byte array explicitly, and + we must unref the stream only when done using the array. + 2000-11-01 Jeffrey Stedfast <fejj@helixcode.com> * e-msg-composer.c (e_msg_composer_new_with_message): Don't create diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 07debafdd0..1b6d2232a4 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -706,7 +706,6 @@ attach_to_multipart (CamelMultipart *multipart, array = g_byte_array_new (); stream = camel_stream_mem_new_with_byte_array (array); camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (attachment->body), stream); - camel_object_unref (CAMEL_OBJECT (stream)); g_byte_array_append (array, "", 1); text = array->data; @@ -715,7 +714,7 @@ attach_to_multipart (CamelMultipart *multipart, else camel_mime_part_set_encoding (attachment->body, CAMEL_MIME_PART_ENCODING_7BIT); - g_byte_array_free (array, TRUE); + camel_object_unref (CAMEL_OBJECT (stream)); } else if (g_strcasecmp (content_type->type, "message") != 0) { camel_mime_part_set_encoding (attachment->body, CAMEL_MIME_PART_ENCODING_BASE64); |