diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-display.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b79f1c26fa..e27dfe30dd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2000-12-07 Dan Winship <danw@helixcode.com> + * mail-display.c (on_object_requested): Make the iTip hack spew a + g_warning and not crash if you have no identity configured. To be + revisited. + * mail-callbacks.c: (various) * folder-browser.c (filter_mlist): * mail-autofilter.c (filter_gui_add_from_message): diff --git a/mail/mail-display.c b/mail/mail-display.c index 6f21db8f6c..a16401a995 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -585,8 +585,8 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) MailConfigIdentity *id; id = mail_config_get_default_identity (); - - g_assert (id != NULL); + if (!id) + g_warning ("No identity configured!"); CORBA_exception_init (&ev); @@ -595,7 +595,7 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) bonobo_property_bag_client_set_value_string (prop_bag, "from_address", from_address, &ev); bonobo_property_bag_client_set_value_string (prop_bag, "my_address", - id->address, &ev); + id ? id->address : "", &ev); g_free(from_address); CORBA_exception_free (&ev); } |