From 7307f00206e782bca6ded41550c7669ea485c75c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Jan 2004 21:13:22 +0000 Subject: [PATCH] Merge from HEAD: Sat Jan 31 22:10:48 2004 Matthias Clasen Merge from HEAD: * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the GtkKeySnooperData. (#132038, R. McFarland) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkmain.c | 5 ++++- 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a55c9aafd6..4e9bc4c252 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jan 31 22:10:48 2004 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the + GtkKeySnooperData. (#132038, R. McFarland) + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a55c9aafd6..4e9bc4c252 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sat Jan 31 22:10:48 2004 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the + GtkKeySnooperData. (#132038, R. McFarland) + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a55c9aafd6..4e9bc4c252 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sat Jan 31 22:10:48 2004 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the + GtkKeySnooperData. (#132038, R. McFarland) + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a55c9aafd6..4e9bc4c252 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sat Jan 31 22:10:48 2004 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the + GtkKeySnooperData. (#132038, R. McFarland) + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a55c9aafd6..4e9bc4c252 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sat Jan 31 22:10:48 2004 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the + GtkKeySnooperData. (#132038, R. McFarland) + 2004-01-30 Not Zed Fixes #132929. diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 78dc4d1c02..1be67465c5 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1791,7 +1791,10 @@ gtk_key_snooper_remove (guint snooper_id) data = NULL; } if (data) - key_snoopers = g_slist_remove (key_snoopers, data); + { + key_snoopers = g_slist_remove (key_snoopers, data); + g_free (data); + } } static gint