Destroy the correct data. (#158522, John Finlay)

2004-11-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_email_hook)
	(gtk_about_dialog_set_url_hook): Destroy the correct
	data.  (#158522, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index fbe9efbd3112cdb5c95faa05ca1a7532ceb6b156..a4115650a33a07e87f5d49e9f2af6ee2a6d5ad81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 fbe9efbd3112cdb5c95faa05ca1a7532ceb6b156..a4115650a33a07e87f5d49e9f2af6ee2a6d5ad81 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 fbe9efbd3112cdb5c95faa05ca1a7532ceb6b156..a4115650a33a07e87f5d49e9f2af6ee2a6d5ad81 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 fbe9efbd3112cdb5c95faa05ca1a7532ceb6b156..a4115650a33a07e87f5d49e9f2af6ee2a6d5ad81 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 2cdcdf29a32536e73cc229acd3337f07cf63983a..b2fc311ab46b692b9e6b5ab1292841360aa5559c 100644 (file)
--- 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;