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

Merge branch 'fix-imcontext-crash' into 'gtk-3-24'

Browse Source 
Fix imcontext crash

See merge request GNOME/gtk!3174
This commit is contained in:
Matthias Clasen
2021-02-09 23:37:27 +00:00
parent e3c03e98f9 d2fe033c21
commit 40295441d1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkimcontextsimple.c
View File

@ -110,6 +110,9 @@ static void gtk_im_context_simple_get_preedit_string (GtkIMContext
char **str, char **str,
PangoAttrList **attrs, PangoAttrList **attrs,
int *cursor_pos); int *cursor_pos);
static void gtk_im_context_simple_set_client_window (GtkIMContext *context,
GdkWindow *window);
static void init_compose_table_async (GCancellable *cancellable, static void init_compose_table_async (GCancellable *cancellable,
GAsyncReadyCallback callback, 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->filter_keypress = gtk_im_context_simple_filter_keypress;
im_context_class->reset = gtk_im_context_simple_reset; 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->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; gobject_class->finalize = gtk_im_context_simple_finalize;
init_compose_table_async (NULL, NULL, NULL); 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); *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) * gtk_im_context_simple_add_table: (skip)
* @context_simple: A #GtkIMContextSimple * @context_simple: A #GtkIMContextSimple