Don't blink the cursor if the text view is not editable.

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.

diff --git a/ChangeLog b/ChangeLog
index cc33b7cc52fc2127205867f8c68738d884217238..88de90d388fc01dd22dc5024298dede80a7a330c 100644 (file)
--- 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 cc33b7cc52fc2127205867f8c68738d884217238..88de90d388fc01dd22dc5024298dede80a7a330c 100644 (file)
--- 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 cc33b7cc52fc2127205867f8c68738d884217238..88de90d388fc01dd22dc5024298dede80a7a330c 100644 (file)
--- 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 f4d9140e3297e8397c17b18a509861bb9e0cbed6..668dd4e12f52f8363af5d012a6847e0ae95fc9ce 100644 (file)
--- 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