Merge branch 'wip/Jehan/GtkIMContextWayland' into 'gtk-3-24'

modules: add a weak pointer to the GtkIMContextWayland.

See merge request GNOME/gtk!2166
This commit is contained in:
Carlos Garnacho 2020-06-29 17:23:09 +00:00
commit bf2d6ab5d6

View File

@ -113,6 +113,8 @@ static const GtkIMContextInfo *info_list[] =
&imwayland_info,
};
static void gtk_im_context_wayland_focus_out (GtkIMContext *context);
#define GTK_IM_CONTEXT_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), type_wayland, GtkIMContextWayland))
#ifndef INCLUDE_IM_wayland
@ -469,6 +471,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->window);
g_clear_object (&context->gesture);
g_free (context->surrounding.text);