diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-config.c | 18 |
3 files changed, 16 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index fd2bd5eb17..a5493807df 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,7 +1,11 @@ +2001-07-25 Jeffrey Stedfast <fejj@ximian.com> + + * mail-callbacks.c (mail_generate_reply): Initialize `me' to NULL. + 2001-07-24 Peter Williams <peterw@ximian.com> - * mail-config.c (mail_config_write): Um, write the HTML signature settings - in the right place. Whoops. + * mail-config.c (mail_config_write): Um, write the HTML signature + settings in the right place. Whoops. 2001-07-24 Jason Leach <jleach@ximian.com> diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 756ade4d0d..1df5939c37 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -634,7 +634,7 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char const char *name = NULL, *address = NULL, *source = NULL; const char *message_id, *references, *reply_addr = NULL; char *text, *subject, *date_str; - const MailConfigAccount *me; + const MailConfigAccount *me = NULL; const GSList *accounts = NULL; GList *to = NULL, *cc = NULL; EMsgComposer *composer; diff --git a/mail/mail-config.c b/mail/mail-config.c index 7afe156d15..9448b3372c 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -1266,22 +1266,22 @@ mail_config_set_default_charset (const char *charset) const MailConfigAccount * mail_config_get_default_account (void) { - MailConfigAccount *retval; - + MailConfigAccount *account; + if (!config->accounts) return NULL; - - retval = g_slist_nth_data (config->accounts, + + account = g_slist_nth_data (config->accounts, config->default_account); - + /* Looks like we have no default, so make the first account the default */ - if (retval == NULL) { + if (account == NULL) { mail_config_set_default_account_num (0); - retval = config->accounts->data; + account = config->accounts->data; } - - return retval; + + return account; } const MailConfigAccount * |