GtkText was handling this just on grab_focus, which is not the only way anymore that focus can reach it. Instead, shift this to focus-in, and add a property that can be used to override the select-on-focus setting. Remove the gtk_text_grab_focus_without_selecting(), but keep the GtkEntry variant of the function, reimplemented to use the properties. GtkSearchEntry sets the select-on-focus property of its text to FALSE, to match expectations.