From e6623c2d8205df0368d34c22260e0046793a25b2 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 25 Jul 2002 05:28:32 +0000 Subject: Mae sure that the html->pointer_url is non-NULL. Should fix bug #28159 2002-07-25 Jeffrey Stedfast * 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 --- mail/ChangeLog | 7 +++++++ mail/mail-display.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'mail') 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 + + * 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 * 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); } -- cgit v1.2.3