diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-02-09 23:37:27 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-09 23:37:27 +0000 |
commit | 40295441d1dc6d397fb8180a8bf654b35ad20041 (patch) | |
tree | 3f951b51c952fa131144f66315dadb2c2ada0ab2 | |
parent | e3c03e98f924637548caf5843291f20256d716e9 (diff) | |
parent | d2fe033c215dd2480d3325ded17c575fb48f9927 (diff) | |
download | gtk+-40295441d1dc6d397fb8180a8bf654b35ad20041.tar.gz |
Merge branch 'fix-imcontext-crash' into 'gtk-3-24'
Fix imcontext crash
See merge request GNOME/gtk!3174
-rw-r--r-- | gtk/gtkimcontextsimple.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index e73f39215e..e1319a79a8 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -110,6 +110,9 @@ static void gtk_im_context_simple_get_preedit_string (GtkIMContext char **str, PangoAttrList **attrs, int *cursor_pos); +static void gtk_im_context_simple_set_client_window (GtkIMContext *context, + GdkWindow *window); + static void init_compose_table_async (GCancellable *cancellable, GAsyncReadyCallback callback, @@ -126,6 +129,7 @@ gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class) im_context_class->filter_keypress = gtk_im_context_simple_filter_keypress; im_context_class->reset = gtk_im_context_simple_reset; im_context_class->get_preedit_string = gtk_im_context_simple_get_preedit_string; + im_context_class->set_client_window = gtk_im_context_simple_set_client_window; gobject_class->finalize = gtk_im_context_simple_finalize; init_compose_table_async (NULL, NULL, NULL); @@ -927,6 +931,12 @@ gtk_im_context_simple_get_preedit_string (GtkIMContext *context, *str = g_string_free (s, FALSE); } +static void +gtk_im_context_simple_set_client_window (GtkIMContext *context, + GdkWindow *window) +{ +} + /** * gtk_im_context_simple_add_table: (skip) * @context_simple: A #GtkIMContextSimple |