diff --git a/ChangeLog b/ChangeLog
index cc33b7cc52..88de90d388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (cursor_blinks): Don't blink the cursor
+	if the text view is not editable.  
+
 	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
 	the popup posted if the button is released over the cellview.
 	This matches the behaviour of other combo box implementations.  
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cc33b7cc52..88de90d388 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (cursor_blinks): Don't blink the cursor
+	if the text view is not editable.  
+
 	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
 	the popup posted if the button is released over the cellview.
 	This matches the behaviour of other combo box implementations.  
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cc33b7cc52..88de90d388 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (cursor_blinks): Don't blink the cursor
+	if the text view is not editable.  
+
 	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
 	the popup posted if the button is released over the cellview.
 	This matches the behaviour of other combo box implementations.  
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f4d9140e32..668dd4e12f 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4444,8 +4444,13 @@ cursor_blinks (GtkTextView *text_view)
   if (gtk_debug_flags & GTK_DEBUG_UPDATES)
     return FALSE;
   
-  g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
-  return blink;
+  if (text_view->editable)
+    {
+      g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
+      return blink;
+    }
+  else
+    return FALSE;
 }
 
 static gint