evolution r37251 - trunk/composer

[mcrha svn gnome org]

Author: mcrha
Date: Thu Feb 12 10:32:23 2009
New Revision: 37251
URL: http://svn.gnome.org/viewvc/evolution?rev=37251&view=rev

Log:
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.



Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-msg-composer.c

Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c	(original)
+++ trunk/composer/e-msg-composer.c	Thu Feb 12 10:32:23 2009
@@ -1294,12 +1294,17 @@
 			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;