[uim-commit] r159 - trunk/uim

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-07 08:00:24 -0800 (Fri, 07 Jan 2005)
New Revision: 159

Modified:
   trunk/uim/anthy.c
   trunk/uim/plugin.h
   trunk/uim/uim-util.c
Log:
* uim/plugin.h
  - (NEW_UIM_PLUGIN): Remove
  - (uim_plugin_init, uim_plugin_quit): Remove
  - (uim_plugin_instance_init, uim_plugin_instance_quit): New
    prototype decl for distinct plugin

* uim/anthy.c
  - Remove unused #include "siod.h". The Siod dependency had already
    been removed

* uim/uim-util.c
  - (sys_libdir, sys_pkglibdir, sys_datadir, sys_pkgdatadir): Fix
    return type LISP with uim_lisp


Modified: trunk/uim/anthy.c
===================================================================
--- trunk/uim/anthy.c	2005-01-07 15:43:08 UTC (rev 158)
+++ trunk/uim/anthy.c	2005-01-07 16:00:24 UTC (rev 159)
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include "uim-scm.h"
 #include "uim-compat-scm.h"
-#include "siod.h"
 #include "context.h"
 #include "plugin.h"
 

Modified: trunk/uim/plugin.h
===================================================================
--- trunk/uim/plugin.h	2005-01-07 15:43:08 UTC (rev 158)
+++ trunk/uim/plugin.h	2005-01-07 16:00:24 UTC (rev 159)
@@ -35,8 +35,6 @@
 #ifndef _uim_plugin_h_included_
 #define _uim_plugin_h_included_
 
-#define NEW_UIM_PLUGIN 1
-
 typedef struct _uim_plugin_info {
   char *name;        /* XXX: should have in scm? */
   char *description; /* XXX: should have in scm? */
@@ -54,7 +52,7 @@
   struct _plugin_list *next;
 } uim_plugin_info_list;
 
-void uim_plugin_init(void);
-void uim_plugin_quit(void);
+void uim_plugin_instance_init(void);
+void uim_plugin_instance_quit(void);
 
 #endif /* _uim_plugin_h_included_ */

Modified: trunk/uim/uim-util.c
===================================================================
--- trunk/uim/uim-util.c	2005-01-07 15:43:08 UTC (rev 158)
+++ trunk/uim/uim-util.c	2005-01-07 16:00:24 UTC (rev 159)
@@ -54,25 +54,25 @@
 extern char *uim_return_str;
 
 /* define constants as procedure to ensure unmodifiable */
-static LISP
+static uim_lisp
 sys_libdir()
 {
   return uim_scm_make_str(LIBDIR);
 }
 
-static LISP
+static uim_lisp
 sys_pkglibdir()
 {
   return uim_scm_make_str(PKGLIBDIR);
 }
 
-static LISP
+static uim_lisp
 sys_datadir()
 {
   return uim_scm_make_str(DATADIR);
 }
 
-static LISP
+static uim_lisp
 sys_pkgdatadir()
 {
   return uim_scm_make_str(PKGDATADIR);