Merge branch 'wip/Jehan/GtkIMContextWayland-master' into 'master'

gtk: focus out the GtkIMContextWayland upon finalization.

See merge request GNOME/gtk!2170
This commit is contained in:
Carlos Garnacho 2020-06-29 22:24:32 +00:00
commit 7170fdebb9

View File

@ -93,6 +93,8 @@ struct _GtkIMContextWayland
guint use_preedit : 1;
};
static void gtk_im_context_wayland_focus_out (GtkIMContext *context);
G_DEFINE_TYPE_WITH_CODE (GtkIMContextWayland, gtk_im_context_wayland, GTK_TYPE_IM_CONTEXT_SIMPLE,
gtk_im_module_ensure_extension_point ();
g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME,
@ -476,6 +478,8 @@ gtk_im_context_wayland_finalize (GObject *object)
{
GtkIMContextWayland *context = GTK_IM_CONTEXT_WAYLAND (object);
gtk_im_context_wayland_focus_out (GTK_IM_CONTEXT (context));
g_clear_object (&context->widget);
g_clear_object (&context->gesture);
g_free (context->surrounding.text);