aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-02-15 11:27:31 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-02-15 11:27:31 +0800
commitf7e298665b02f72890c6681e6d21ef5601beccbb (patch)
tree4df0be16faf8d03b1881bd5f9e89280195ec341c /composer
parentccd8e3964f548798eb05a430b3ea81b2760069cc (diff)
downloadgsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.gz
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.bz2
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.lz
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.xz
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.zst
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.zip
Merge revisions 37200:3266 from trunk.
svn path=/branches/kill-bonobo/; revision=37270
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer.c7
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 f2be8a18fc..65a372d0d0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1186,12 +1186,17 @@ get_signature_html (EMsgComposer *composer)
text = e_read_signature_file (
signature, TRUE, NULL);
} 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;