[gtk/gtk-3-24: 2/3] imwayland: Fix clearing of preedit text in webkitgtk

[Matthias Clasen <matthiasc src gnome org>]

commit 99669503fbc228fcca0edcf9a739354808c46ddb
Author: Dorota Czaplejewicz <dorota czaplejewicz puri sm>
Date:   Tue Sep 11 12:12:28 2018 +0000

    imwayland: Fix clearing of preedit text in webkitgtk
    
    Fixes webkitgtk misbehaviour as outlined in https://gitlab.gnome.org/GNOME/gtk/issues/1316#note_312942 , 
which was introduced in 49b17e6c.
    The preedit will be cleared on exit only if it is already present.

 modules/input/imwayland.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
index 1fe95f38a1..25144f314c 100644
--- a/modules/input/imwayland.c
+++ b/modules/input/imwayland.c
@@ -654,8 +654,11 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
   commit_state (context_wayland);
 
   /* after disable, incoming state changes won't take effect anyway */
-  text_input_preedit (global, global->text_input, NULL, 0, 0);
-  text_input_preedit_apply (global);
+  if (context_wayland->current_preedit.text)
+    {
+      text_input_preedit (global, global->text_input, NULL, 0, 0);
+      text_input_preedit_apply (global);
+    }
 
   global->current = NULL;
 }