callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't die in an assertion if focus went missing. Just warn, clean up and

Browse Source 
2006-12-29  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkentry.c (blink_cb):
        * gtk/gtktextview.c (blink_cb): Don't die in an assertion
        if focus went missing. Just warn, clean up and continue.
        (#374378)
This commit is contained in:
Matthias Clasen
2006-12-29 19:26:34 +00:00
committed by Matthias Clasen
parent 35ac74a037
commit 4193650dc9
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-12-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (blink_cb):
* gtk/gtktextview.c (blink_cb): Don't die in an assertion
if focus went missing. Just warn, clean up and continue.
(#374378)
2006-12-29 Carlos Garnacho <carlosg@gnome.org>
* gtk/gtknotebook.c (gtk_notebook_scroll): return if the widget that

5
gtk/gtkentry.c
View File

@ -5385,9 +5385,12 @@ blink_cb (gpointer data)
g_warning ("GtkEntry - did not receive focus-out-event. If you\n"
"connect a handler to this signal, it must return\n"
"FALSE so the entry gets the event as well");
gtk_entry_check_cursor_blink (entry);
return FALSE;
}
g_assert (GTK_WIDGET_HAS_FOCUS (entry));
g_assert (entry->selection_bound == entry->current_pos);
blink_timeout = get_cursor_blink_timeout (entry);

5
gtk/gtktextview.c
View File

@ -4514,10 +4514,13 @@ blink_cb (gpointer data)
g_warning ("GtkTextView - did not receive focus-out-event. If you\n"
"connect a handler to this signal, it must return\n"
"FALSE so the text view gets the event as well");
gtk_text_view_check_cursor_blink (text_view);
return FALSE;
}
g_assert (text_view->layout);
g_assert (GTK_WIDGET_HAS_FOCUS (text_view));
g_assert (text_view->cursor_visible);
visible = gtk_text_layout_get_cursor_visible (text_view->layout);