diff --git a/ChangeLog b/ChangeLog
index 11902fb43a..e9b6c7c742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+	the entry is not editable.  (#304171,Nikos Kouremenos)
+
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 11902fb43a..e9b6c7c742 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+	the entry is not editable.  (#304171,Nikos Kouremenos)
+
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 11902fb43a..e9b6c7c742 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+	the entry is not editable.  (#304171,Nikos Kouremenos)
+
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 12d00dd8be..0061fc1fa3 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4790,6 +4790,7 @@ cursor_blinks (GtkEntry *entry)
   gboolean blink;
 
   if (GTK_WIDGET_HAS_FOCUS (entry) &&
+      entry->editable &&
       entry->selection_bound == entry->current_pos)
     {
       g_object_get (settings, "gtk-cursor-blink", &blink, NULL);