Commit: 85a6cceed324936b50797a3cc8fa9aa5f60ebde5 - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 85a6cceed324936b50797a3cc8fa9aa5f60ebde5 (tree)
• Time: 2005-10-04 02:46:19
• Author: yamaken <yamaken@ff9a...>
• Commiter: yamaken

Log Message

* uim/slib.c
* uim/uim.c

- Port r1592-1593 from trunk

Change Summary

• modified: uim/slib.c
• modified: uim/uim.c

Incremental Difference

--- a/uim/slib.c
+++ b/uim/slib.c
@@ -274,7 +274,7 @@ static void siod_set_lib_path(const char *);
 #else
 #define NEWCELL(_into, _type)		\
 {  _NEWCELL (_into, _type);		\
-   (*_into).dbg_info = car (dbg_pos);}
+   (*_into).dbg_info = NIL; }
 #endif /* DEBUG_SCM */
 
 /* exported global symbol */

--- a/uim/uim.c
+++ b/uim/uim.c
@@ -58,7 +58,6 @@ static uim_context context_array[CONTEXT_ARRAY_SIZE];
 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 @@ uim_quit(void)
 {
   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 @@ uim_quit(void)
   free(uim_last_client_encoding);
   uim_last_client_encoding = NULL;
   uim_initialized = 0;
-  uim_quiting = 0;
 }