[uim-commit] r350 - in trunk: scm uim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-23 04:57:20 -0800 (Sun, 23 Jan 2005)
New Revision: 350

Modified:
   trunk/scm/skk.scm
   trunk/uim/skk-dic.c
Log:
 * scm/skk-scm (skk-proc-state-kanji) : Check if skk-context-head
   is empty to start auto conversion.
* uim/skk-dic.c (open_lock) : Fix typo.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-01-22 09:32:51 UTC (rev 349)
+++ trunk/scm/skk.scm	2005-01-23 12:57:20 UTC (rev 350)
@@ -1158,7 +1158,8 @@
 	 (and
 	  (if (and
 	       skk-auto-start-henkan?
-	       (string-find skk-auto-start-henkan-keyword-list (car res)))
+	       (string-find skk-auto-start-henkan-keyword-list (car res))
+	       (not (null? (skk-context-head sc))))
 	      (begin
 		(skk-context-set-appendix! sc (list res))
 		(skk-begin-conversion sc)

Modified: trunk/uim/skk-dic.c
===================================================================
--- trunk/uim/skk-dic.c	2005-01-22 09:32:51 UTC (rev 349)
+++ trunk/uim/skk-dic.c	2005-01-23 12:57:20 UTC (rev 350)
@@ -1652,7 +1652,7 @@
   struct flock fl;
   char *lock_fn;
 
-  lock_fn = malloc(sizeof(char *) * (strlen(name) + strlen(".lock") + 1));
+  lock_fn = malloc(sizeof(char) * (strlen(name) + strlen(".lock") + 1));
   if (lock_fn == NULL)
     return -1;
   sprintf(lock_fn, "%s.lock", name);