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

multipress: Only emit preedit signals if needed

Browse Source 
When clearing the compose buffer, don't emit preedit-changed
unconditionally. This triggers a recursion which leads to
a crash.

https://bugzilla.gnome.org/show_bug.cgi?id=753644
This commit is contained in:
Matthias Clasen
2015-08-18 15:42:56 -04:00
parent 783afbd64f
commit f3a34856c5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/input/gtkimcontextmultipress.c
View File

@ -171,11 +171,14 @@ clear_compose_buffer (GtkImContextMultipress *multipress_context)
multipress_context->key_last_entered = 0; multipress_context->key_last_entered = 0;
multipress_context->compose_count = 0; multipress_context->compose_count = 0;
multipress_context->tentative_match = NULL;
cancel_automatic_timeout_commit (multipress_context); cancel_automatic_timeout_commit (multipress_context);
g_signal_emit_by_name (multipress_context, "preedit-changed"); if (multipress_context->tentative_match)
g_signal_emit_by_name (multipress_context, "preedit-end"); {
multipress_context->tentative_match = NULL;
g_signal_emit_by_name (multipress_context, "preedit-changed");
g_signal_emit_by_name (multipress_context, "preedit-end");
}
} }
/* Finish composing, provide the character, and clear our compose buffer. /* Finish composing, provide the character, and clear our compose buffer.