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

Take a reference on the im context for async ops

Browse Source 
This might fix the crash in yelp that some people continue
to see.

https://bugzilla.gnome.org/show_bug.cgi?id=762887
This commit is contained in:
Matthias Clasen
2016-03-01 07:58:12 -05:00
parent 3607b9aa2e
commit eff97fd55f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkimcontextsimple.c
View File

@ -232,16 +232,12 @@ init_compose_table_thread_cb (GTask *task,
gpointer task_data, gpointer task_data,
GCancellable *cancellable) GCancellable *cancellable)
{ {
GtkIMContextSimple *im_context_simple;
if (g_task_return_error_if_cancelled (task)) if (g_task_return_error_if_cancelled (task))
return; return;
g_return_if_fail (GTK_IS_IM_CONTEXT_SIMPLE (task_data)); g_return_if_fail (GTK_IS_IM_CONTEXT_SIMPLE (task_data));
im_context_simple = GTK_IM_CONTEXT_SIMPLE (task_data); gtk_im_context_simple_init_compose_table (GTK_IM_CONTEXT_SIMPLE (task_data));
gtk_im_context_simple_init_compose_table (im_context_simple);
} }
void void
@ -252,7 +248,7 @@ init_compose_table_async (GtkIMContextSimple *im_context_simple,
{ {
GTask *task = g_task_new (NULL, cancellable, callback, user_data); GTask *task = g_task_new (NULL, cancellable, callback, user_data);
g_task_set_source_tag (task, init_compose_table_async); g_task_set_source_tag (task, init_compose_table_async);
g_task_set_task_data (task, im_context_simple, NULL); g_task_set_task_data (task, g_object_ref (im_context_simple), g_object_unref);
g_task_run_in_thread (task, init_compose_table_thread_cb); g_task_run_in_thread (task, init_compose_table_thread_cb);
g_object_unref (task); g_object_unref (task);
} }