diff options
| -rw-r--r-- | camel/ChangeLog | 10 | ||||
| -rw-r--r-- | camel/camel-folder-summary.c | 19 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-command.c | 8 |
3 files changed, 28 insertions, 9 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 16b424ee81..5db9911b88 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,15 @@ 2001-07-05 Jeffrey Stedfast <fejj@ximian.com> + * camel-folder-summary.c (camel_message_info_string): Added an + assert to make sure that `mi' isn't NULL. + (camel_message_info_set_string): Same. + + * providers/imap/camel-imap-command.c (camel_imap_response_free): + Create and use a temporary CamelException for use with + camel_imap_folder_changed. + +2001-07-05 Jeffrey Stedfast <fejj@ximian.com> + * camel-pgp-context.c (pgp_verify): Send the --no-auto-key-retrieve argument to gpg if we are in offline mode so that we don't have to worry about gpg hanging if it can't diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index 1dfdff9dd6..2b8fa3734f 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -2443,24 +2443,29 @@ camel_message_info_free(CamelMessageInfo *mi) } #if defined (DOEPOOLV) || defined (DOESTRV) -const char *camel_message_info_string(const CamelMessageInfo *mi, int type) +const char * +camel_message_info_string (const CamelMessageInfo *mi, int type) { + g_assert (mi != NULL); + if (mi->strings == NULL) return ""; #ifdef DOEPOOLV - return e_poolv_get(mi->strings, type); + return e_poolv_get (mi->strings, type); #else - return e_strv_get(mi->strings, type); + return e_strv_get (mi->strings, type); #endif } -void camel_message_info_set_string(CamelMessageInfo *mi, int type, char *str) +void +camel_message_info_set_string (CamelMessageInfo *mi, int type, char *str) { - g_assert(mi->strings != NULL); + g_assert (mi != NULL); + g_assert (mi->strings != NULL); #ifdef DOEPOOLV - e_poolv_set(mi->strings, type, str, TRUE); + e_poolv_set (mi->strings, type, str, TRUE); #else - mi->strings = e_strv_set_ref_free(mi->strings, type, str); + mi->strings = e_strv_set_ref_free (mi->strings, type, str); #endif } #endif diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c index ce6f60554d..8c5532c612 100644 --- a/camel/providers/imap/camel-imap-command.c +++ b/camel/providers/imap/camel-imap-command.c @@ -413,8 +413,12 @@ camel_imap_response_free (CamelImapStore *store, CamelImapResponse *response) if (response->folder) { if (exists > 0 || expunged) { /* Update the summary */ - camel_imap_folder_changed (response->folder, - exists, expunged, NULL); + CamelException ex; + + camel_exception_init (&ex); + camel_imap_folder_changed (response->folder, exists, expunged, &ex); + camel_exception_clear (&ex); + if (expunged) g_array_free (expunged, TRUE); } |