diff --git a/ChangeLog b/ChangeLog
index a394b88fa..b6b3c6202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-22  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	* gtk/gtksockget.c: (gtk_socket_realize): Remove second call of
+	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED).
+
 2008-05-21  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/gdkwindow-quartz.c:
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 185057f35..25a96690d 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -334,8 +334,6 @@ gtk_socket_realize (GtkWidget *widget)
 			 _gtk_socket_windowing_filter_func,
 			 widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
   /* We sync here so that we make sure that if the XID for
    * our window is passed to another application, SubstructureRedirectMask
    * will be set by the time the other app creates its window.