From ba6f66ab8e05a38670b3148bb8a970071bfbc1e1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 17 Nov 2004 22:38:38 +0000 Subject: [PATCH] Destroy the correct data. (#158522, John Finlay) 2004-11-17 Matthias Clasen * gtk/gtkaboutdialog.c (gtk_about_dialog_set_email_hook) (gtk_about_dialog_set_url_hook): Destroy the correct data. (#158522, John Finlay) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkaboutdialog.c | 4 ++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbe9efbd31..a4115650a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_set_email_hook) + (gtk_about_dialog_set_url_hook): Destroy the correct + data. (#158522, John Finlay) + 2004-11-16 Matthias Clasen * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fbe9efbd31..a4115650a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_set_email_hook) + (gtk_about_dialog_set_url_hook): Destroy the correct + data. (#158522, John Finlay) + 2004-11-16 Matthias Clasen * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fbe9efbd31..a4115650a3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_set_email_hook) + (gtk_about_dialog_set_url_hook): Destroy the correct + data. (#158522, John Finlay) + 2004-11-16 Matthias Clasen * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fbe9efbd31..a4115650a3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_set_email_hook) + (gtk_about_dialog_set_url_hook): Destroy the correct + data. (#158522, John Finlay) + 2004-11-16 Matthias Clasen * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 2cdcdf29a3..b2fc311ab4 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -2046,7 +2046,7 @@ gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func, GtkAboutDialogActivateLinkFunc old; if (activate_email_hook_destroy != NULL) - (* activate_email_hook_destroy) (activate_url_hook_data); + (* activate_email_hook_destroy) (activate_email_hook_data); old = activate_email_hook; @@ -2078,7 +2078,7 @@ gtk_about_dialog_set_url_hook (GtkAboutDialogActivateLinkFunc func, GtkAboutDialogActivateLinkFunc old; if (activate_url_hook_destroy != NULL) - (* activate_url_hook_destroy) (activate_email_hook_data); + (* activate_url_hook_destroy) (activate_url_hook_data); old = activate_url_hook;