diff --git a/ChangeLog b/ChangeLog
index 25893de543..71e335f835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-09  Mark McLoughlin  <mark@skynet.ie>
+
+	Fixes "notification area leaks space" (bug #312687)
+
+	* gtk/gtksocket-x11.c: (_gtk_socket_windowing_filter_func):
+	  gtk/gtkplug.c: (_gtk_plug_add_to_socket): don't pass a 
+	detail to g_signal_emit_by_name()
+
 2005-08-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25893de543..71e335f835 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-08-09  Mark McLoughlin  <mark@skynet.ie>
+
+	Fixes "notification area leaks space" (bug #312687)
+
+	* gtk/gtksocket-x11.c: (_gtk_socket_windowing_filter_func):
+	  gtk/gtkplug.c: (_gtk_plug_add_to_socket): don't pass a 
+	detail to g_signal_emit_by_name()
+
 2005-08-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25893de543..71e335f835 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-08-09  Mark McLoughlin  <mark@skynet.ie>
+
+	Fixes "notification area leaks space" (bug #312687)
+
+	* gtk/gtksocket-x11.c: (_gtk_socket_windowing_filter_func):
+	  gtk/gtkplug.c: (_gtk_plug_add_to_socket): don't pass a 
+	detail to g_signal_emit_by_name()
+
 2005-08-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 257afdb3af..f901dae5e7 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -254,7 +254,7 @@ _gtk_plug_add_to_socket (GtkPlug   *plug,
 
   gtk_widget_set_parent (widget, GTK_WIDGET (socket));
 
-  g_signal_emit_by_name (socket, "plug_added", 0);
+  g_signal_emit_by_name (socket, "plug_added");
 }
 
 /**
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 160af72e5c..46d7f5f216 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -494,7 +494,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
 	    _gtk_socket_end_embedding (socket);
 
 	    g_object_ref (widget);
-	    g_signal_emit_by_name (widget, "plug_removed", 0, &result);
+	    g_signal_emit_by_name (widget, "plug_removed", &result);
 	    if (!result)
 	      gtk_widget_destroy (widget);
 	    g_object_unref (widget);