Merge from HEAD:

Sat Jan 31 22:10:48 2004  Matthias Clasen  <maclas@gmx.de>

	Merge from HEAD:

	* gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the
	GtkKeySnooperData.  (#132038, R. McFarland)
This commit is contained in:
Matthias Clasen
2004-01-31 21:13:22 +00:00
committed by Matthias Clasen
parent 6e0655fb50
commit 7307f00206
6 changed files with 39 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the
GtkKeySnooperData. (#132038, R. McFarland)
2004-01-30 Not Zed <NotZed@Ximian.com>
Fixes #132929.

View File

@@ -1,3 +1,10 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the
GtkKeySnooperData. (#132038, R. McFarland)
2004-01-30 Not Zed <NotZed@Ximian.com>
Fixes #132929.

View File

@@ -1,3 +1,10 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the
GtkKeySnooperData. (#132038, R. McFarland)
2004-01-30 Not Zed <NotZed@Ximian.com>
Fixes #132929.

View File

@@ -1,3 +1,10 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the
GtkKeySnooperData. (#132038, R. McFarland)
2004-01-30 Not Zed <NotZed@Ximian.com>
Fixes #132929.

View File

@@ -1,3 +1,10 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the
GtkKeySnooperData. (#132038, R. McFarland)
2004-01-30 Not Zed <NotZed@Ximian.com>
Fixes #132929.

View File

@@ -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