diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-07-25 13:28:32 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-07-25 13:28:32 +0800 |
| commit | e6623c2d8205df0368d34c22260e0046793a25b2 (patch) | |
| tree | 5bda857677ef43195bc798ba3e7320cf48f74d92 | |
| parent | 65f894d915a8c3a1caab62365e09c35d97166b11 (diff) | |
| download | gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.tar gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.tar.gz gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.tar.bz2 gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.tar.lz gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.tar.xz gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.tar.zst gsoc2013-evolution-e6623c2d8205df0368d34c22260e0046793a25b2.zip | |
Mae sure that the html->pointer_url is non-NULL. Should fix bug #28159
2002-07-25 Jeffrey Stedfast <fejj@ximian.com>
* mail-display.c (link_open_in_browser): Mae sure that the
html->pointer_url is non-NULL. Should fix bug #28159 (this seems
to be the only questionable way for a NULL url to be passed into
on_link_clicked).
svn path=/trunk/; revision=17581
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-display.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3e5f9e419f..c35438aab3 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-07-25 Jeffrey Stedfast <fejj@ximian.com> + + * mail-display.c (link_open_in_browser): Mae sure that the + html->pointer_url is non-NULL. Should fix bug #28159 (this seems + to be the only questionable way for a NULL url to be passed into + on_link_clicked). + 2002-07-24 Peter Williams <peterw@ximian.com> * mail-callbacks.c (do_mail_fetch_and_print): Check for whether diff --git a/mail/mail-display.c b/mail/mail-display.c index ea10ef7531..376753a7df 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -195,9 +195,10 @@ static gboolean idle_redisplay (gpointer data) { MailDisplay *md = data; - + md->idle_id = 0; mail_display_redisplay (md, FALSE); + return FALSE; } @@ -1762,6 +1763,9 @@ mail_display_class_init (GtkObjectClass *object_class) static void link_open_in_browser (GtkWidget *w, MailDisplay *mail_display) { + if (!mail_display->html->pointer_url) + return; + on_link_clicked (mail_display->html, mail_display->html->pointer_url, mail_display); } |