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

[tkng@freedesktop.org]

Author: tkng
Date: 2005-01-10 15:25:07 -0800 (Mon, 10 Jan 2005)
New Revision: 237

Modified:
   trunk/scm/loader.scm
   trunk/uim/Makefile.am
   trunk/uim/context.h
   trunk/uim/prime.c
   trunk/uim/uim.c
Log:
* scm/loader.scm: Added calling of new plugin prime.

* uim/Makefile.am: Added new plugin file libuim-prime.so.

* uim/uim.c: Removed calling of uim_init_prime/uim_quit_prime.

* uim/context.h: Removed function prototypes of uim_init_prime and
   uim_quit_prime.

* uim/prime.c:
 -(uim_plugin_instance_init): Renamed from uim_init_prime.
 -(uim_plugin_instance_quit): Renamed from uim_init_prime.


Modified: trunk/scm/loader.scm
===================================================================
--- trunk/scm/loader.scm	2005-01-10 23:11:52 UTC (rev 236)
+++ trunk/scm/loader.scm	2005-01-10 23:25:07 UTC (rev 237)
@@ -36,10 +36,8 @@
 (require "pyload.scm")
 
 (load-plugin "anthy")
-
 (load-plugin "canna")
-
-(require "prime.scm")
+(load-plugin "prime")
 (load-plugin "skk")
 (require "tcode.scm")
 (require "tutcode.scm")

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-01-10 23:11:52 UTC (rev 236)
+++ trunk/uim/Makefile.am	2005-01-10 23:25:07 UTC (rev 237)
@@ -69,6 +69,12 @@
   libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
+uim_plugin_LTLIBRARIES += libuim-prime.la
+libuim_prime_la_SOURCES = prime.c
+libuim_prime_la_LIBADD = libuim.la
+libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
+
 uim_plugin_LTLIBRARIES += libuim-skk.la
 libuim_skk_la_SOURCES = skk-dic.c
 libuim_skk_la_LIBADD = libuim.la

Modified: trunk/uim/context.h
===================================================================
--- trunk/uim/context.h	2005-01-10 23:11:52 UTC (rev 236)
+++ trunk/uim/context.h	2005-01-10 23:25:07 UTC (rev 237)
@@ -284,8 +284,6 @@
 void uim_init_intl_subrs(void);
 
 /**/
-void uim_init_prime(void);
-void uim_quit_prime(void);
 void uim_init_plugin(void);
 void uim_quit_plugin(void);
 

Modified: trunk/uim/prime.c
===================================================================
--- trunk/uim/prime.c	2005-01-10 23:11:52 UTC (rev 236)
+++ trunk/uim/prime.c	2005-01-10 23:25:07 UTC (rev 237)
@@ -38,6 +38,7 @@
 #include "uim-scm.h"
 #include "uim-compat-scm.h"
 #include "context.h"
+#include "plugin.h"
 
 static FILE *primer = NULL, *primew = NULL;
 static int prime_pid = 0;
@@ -75,14 +76,14 @@
 }
 
 void
-uim_init_prime(void)
+uim_plugin_instance_init(void)
 {
   uim_scm_init_subr_0("prime-lib-init", prime_lib_init);
   uim_scm_init_subr_1("prime-lib-send-command", prime_send_command);
 }
 
 void
-uim_quit_prime(void)
+uim_plugin_instance_quit(void)
 {
   if(primew) {
     uim_ipc_send_command(&prime_pid, &primer, &primew, prime_command, "close\n");

Modified: trunk/uim/uim.c
===================================================================
--- trunk/uim/uim.c	2005-01-10 23:11:52 UTC (rev 236)
+++ trunk/uim/uim.c	2005-01-10 23:25:07 UTC (rev 237)
@@ -658,7 +658,6 @@
 #ifdef UIM_COMPAT_TABLE
   uim_init_table_subrs();
 #endif
-  uim_init_prime();
 
   scm_files = getenv("LIBUIM_SCM_FILES");
   uim_scm_set_lib_path((scm_files) ? scm_files : SCM_FILES);
@@ -728,7 +727,6 @@
     }
   }
   /**/
-  uim_quit_prime();
   uim_quit_plugin();
   uim_scm_quit();
   uim_last_client_encoding = NULL;