diff --git a/ChangeLog b/ChangeLog
index db144aedba..9ebf97bb09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May 10 15:03:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkwidget.c (_gtk_widget_grab_notify): New internal function
+	that emits the grab notify signal.
+	
+	* gtk/gtkmain.c (gtk_grab_notify_foreach): Use it here.
+
 Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmenu.c: Make destruction of a torn off menu work 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db144aedba..9ebf97bb09 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon May 10 15:03:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkwidget.c (_gtk_widget_grab_notify): New internal function
+	that emits the grab notify signal.
+	
+	* gtk/gtkmain.c (gtk_grab_notify_foreach): Use it here.
+
 Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmenu.c: Make destruction of a torn off menu work 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db144aedba..9ebf97bb09 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon May 10 15:03:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkwidget.c (_gtk_widget_grab_notify): New internal function
+	that emits the grab notify signal.
+	
+	* gtk/gtkmain.c (gtk_grab_notify_foreach): Use it here.
+
 Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmenu.c: Make destruction of a torn off menu work 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db144aedba..9ebf97bb09 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon May 10 15:03:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkwidget.c (_gtk_widget_grab_notify): New internal function
+	that emits the grab notify signal.
+	
+	* gtk/gtkmain.c (gtk_grab_notify_foreach): Use it here.
+
 Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmenu.c: Make destruction of a torn off menu work 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 64f94bac4a..9b301dbfc1 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1682,8 +1682,8 @@ gtk_grab_notify_foreach (GtkWidget *child,
   if (was_grabbed != is_grabbed)
     {
       g_object_ref (child);
-      
-      g_signal_emit_by_name (child, "grab_notify", was_grabbed);
+
+      _gtk_widget_grab_notify (child, was_grabbed);
       
       if (GTK_IS_CONTAINER (child))
 	gtk_container_foreach (GTK_CONTAINER (child), gtk_grab_notify_foreach, info);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 098b0d4471..d1f5208fdb 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3803,6 +3803,22 @@ gtk_widget_region_intersect (GtkWidget *widget,
   return dest;
 }
 
+/**
+ * _gtk_widget_grab_notify:
+ * @widget: a #GtkWidget
+ * @was_grabbed: whether a grab is now in effect
+ * 
+ * Emits the signal "grab_notify" on @widget.
+ * 
+ * Since: 2.6
+ **/
+void
+_gtk_widget_grab_notify (GtkWidget *widget,
+			 gboolean   was_grabbed)
+{
+  g_signal_emit (widget, widget_signals[GRAB_NOTIFY], 0, was_grabbed);
+}
+
 /**
  * gtk_widget_grab_focus:
  * @widget: a #GtkWidget