diff --git a/ChangeLog b/ChangeLog
index c48f59482e..5fd7c91d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_drag_data_received): Don't leak
+	in the non-editable case.  (#350258, Colin Leroy)
+
 2006-08-10  Michael Emmel  <mike.emmel@gmail.com>
 
 	* gdk/directfb/gdkdrawable-directfb.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c48f59482e..5fd7c91d0a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-08-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_drag_data_received): Don't leak
+	in the non-editable case.  (#350258, Colin Leroy)
+
 2006-08-10  Michael Emmel  <mike.emmel@gmail.com>
 
 	* gdk/directfb/gdkdrawable-directfb.c
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 5b0ee549ca..ca1b60d31c 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -5130,7 +5130,6 @@ gtk_entry_drag_data_received (GtkWidget        *widget,
 	  gtk_editable_insert_text (editable, str, length, &sel1);
 	}
       
-      g_free (str);
       gtk_drag_finish (context, TRUE, context->action == GDK_ACTION_MOVE, time);
     }
   else
@@ -5138,6 +5137,8 @@ gtk_entry_drag_data_received (GtkWidget        *widget,
       /* Drag and drop didn't happen! */
       gtk_drag_finish (context, FALSE, FALSE, time);
     }
+
+  g_free (str);
 }
 
 static void