[gtk+/gtk-2-24] Avoid infinite recursion in the ime input module



commit 53f3e5ee9417624ed6e878528b3670127b238dea
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 19 09:29:51 2012 -0500

    Avoid infinite recursion in the ime input module

 modules/input/gtkimcontextime.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 84fd1e0..7fed7c6 100644
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -349,11 +349,14 @@ gtk_im_context_ime_reset (GtkIMContext *context)
   if (!himc)
     return;
 
-  if (context_ime->preediting && ImmGetOpenStatus (himc))
-    ImmNotifyIME (himc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
+  if (context_ime->preediting)
+    {
+      if (ImmGetOpenStatus (himc))
+        ImmNotifyIME (himc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
 
-  context_ime->preediting = FALSE;
-  g_signal_emit_by_name (context, "preedit-changed");
+      context_ime->preediting = FALSE;
+      g_signal_emit_by_name (context, "preedit-changed");
+    }
 
   ImmReleaseContext (hwnd, himc);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]