diff options
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index dab9cff1a7..3d731d7ed2 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2009-02-12 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #567089 + + * e-msg-composer.c: (get_signature_html): + Do not crash when no From set yet. + 2009-01-11 Matthew Barnes <mbarnes@redhat.com> * e-msg-composer.c (msg_composer_link_clicked): diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index d13d799ab2..12a33cea4f 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1294,12 +1294,17 @@ get_signature_html (EMsgComposer *composer) text = e_msg_composer_get_sig_file_content (signature->filename, format_html); } } else { + EAccount *account; EAccountIdentity *id; gchar *organization; gchar *address; gchar *name; - id = e_composer_header_table_get_account (table)->id; + account = e_composer_header_table_get_account (table); + if (!account) + return NULL; + + id = account->id; address = id->address ? camel_text_to_html (id->address, CONVERT_SPACES, 0) : NULL; name = id->name ? camel_text_to_html (id->name, CONVERT_SPACES, 0) : NULL; organization = id->organization ? camel_text_to_html (id->organization, CONVERT_SPACES, 0) : NULL; |