From 911a8a63c316da8ecf993839334175964ffd1b7d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 16 May 2005 21:14:05 +0000 Subject: [PATCH] Don't blink the cursor if the entry is not editable. (#304171,Nikos 2005-05-16 Matthias Clasen * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if the entry is not editable. (#304171,Nikos Kouremenos) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkentry.c | 1 + 4 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 30971cb87f..36ba87a51b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-16 Matthias Clasen + * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if + the entry is not editable. (#304171,Nikos Kouremenos) + * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): Make sure the action of the button and the dialog are in sync, when the dialog is provided by the app. (#303987, David A Knight) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 30971cb87f..36ba87a51b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-05-16 Matthias Clasen + * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if + the entry is not editable. (#304171,Nikos Kouremenos) + * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): Make sure the action of the button and the dialog are in sync, when the dialog is provided by the app. (#303987, David A Knight) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 30971cb87f..36ba87a51b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-05-16 Matthias Clasen + * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if + the entry is not editable. (#304171,Nikos Kouremenos) + * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): Make sure the action of the button and the dialog are in sync, when the dialog is provided by the app. (#303987, David A Knight) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index b7b69420f9..88badc5e4f 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4788,6 +4788,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);