diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-12-08 04:50:09 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-12-08 04:50:09 +0800 |
| commit | 907a6cf1e3d9fe091a978488591363516cab6a85 (patch) | |
| tree | 5241a3f1dbe739d241ee5905754da13e3f377860 | |
| parent | 33150f282cd0c80bb429d934849f9199390e0e4a (diff) | |
| download | gsoc2013-evolution-907a6cf1e3d9fe091a978488591363516cab6a85.tar.gz gsoc2013-evolution-907a6cf1e3d9fe091a978488591363516cab6a85.tar.zst gsoc2013-evolution-907a6cf1e3d9fe091a978488591363516cab6a85.zip | |
Make the iTip hack spew a g_warning and not crash if you have no identity
* 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.
svn path=/trunk/; revision=6845
| -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); } |