[uim-commit] r1776 - branches/0.4/uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-03 10:46:19 -0700 (Mon, 03 Oct 2005)
New Revision: 1776

Modified:
   branches/0.4/uim/slib.c
   branches/0.4/uim/uim.c
Log:
* uim/slib.c
* uim/uim.c
  - Port r1592-1593 from trunk


Modified: branches/0.4/uim/slib.c
===================================================================
--- branches/0.4/uim/slib.c	2005-10-03 17:09:38 UTC (rev 1775)
+++ branches/0.4/uim/slib.c	2005-10-03 17:46:19 UTC (rev 1776)
@@ -274,7 +274,7 @@
 #else
 #define NEWCELL(_into, _type)		\
 {  _NEWCELL (_into, _type);		\
-   (*_into).dbg_info = car (dbg_pos);}
+   (*_into).dbg_info = NIL; }
 #endif /* DEBUG_SCM */
 
 /* exported global symbol */

Modified: branches/0.4/uim/uim.c
===================================================================
--- branches/0.4/uim/uim.c	2005-10-03 17:09:38 UTC (rev 1775)
+++ branches/0.4/uim/uim.c	2005-10-03 17:46:19 UTC (rev 1776)
@@ -58,7 +58,6 @@
 struct uim_im *uim_im_array;
 int uim_nr_im;
 static int uim_initialized;
-static int uim_quiting;
 
 void
 uim_set_preedit_cb(uim_context uc,
@@ -671,11 +670,9 @@
 {
   int i;
 
-  if (!uim_initialized || uim_quiting) {
+  if (!uim_initialized) {
     return;
   }
-  /* Some multithreaded applications calls uim_quit bursty. */
-  uim_quiting = 1;
 
   /* release still active contexts */
   for (i = 0; i < CONTEXT_ARRAY_SIZE; i++) {
@@ -689,5 +686,4 @@
   free(uim_last_client_encoding);
   uim_last_client_encoding = NULL;
   uim_initialized = 0;
-  uim_quiting = 0;
 }