[uim-commit] r385 - in trunk: po scm uim

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-28 14:19:09 -0800 (Fri, 28 Jan 2005)
New Revision: 385

Added:
   trunk/scm/init.scm
Removed:
   trunk/scm/loader.scm
Modified:
   trunk/po/POTFILES.in
   trunk/scm/Makefile.am
   trunk/uim/uim.c
Log:
* scm/loader.scm
  - Rename to init.scm
* scm/init.scm
  - Renamed from loader.scm

* scm/Makefile.am
* po/POTFILES.in
  - Replace loader.scm with init.scm

* uim/uim.c
  - (uim_init_scm): Replace loader.scm with init.scm


Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2005-01-28 22:08:11 UTC (rev 384)
+++ trunk/po/POTFILES.in	2005-01-28 22:19:09 UTC (rev 385)
@@ -47,7 +47,7 @@
 scm/latin.scm
 scm/lazy-load.scm
 scm/load-action.scm
-scm/loader.scm
+scm/init.scm
 scm/m17nlib.scm
 scm/pinyin-big5.scm
 scm/prime-custom.scm

Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am	2005-01-28 22:08:11 UTC (rev 384)
+++ trunk/scm/Makefile.am	2005-01-28 22:19:09 UTC (rev 385)
@@ -1,7 +1,7 @@
 EXTRA_DIST = $(SCM_FILES)
 scmdir = $(datadir)/uim
 scm_DATA = $(SCM_FILES) installed-modules.scm enabled-ims.scm
-SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm loader.scm \
+SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm init.scm \
  default.scm \
  util.scm key.scm ustr.scm action.scm load-action.scm i18n.scm \
  uim-sh.scm custom.scm custom-rt.scm \

Copied: trunk/scm/init.scm (from rev 384, trunk/scm/loader.scm)

Deleted: trunk/scm/loader.scm
===================================================================
--- trunk/scm/loader.scm	2005-01-28 22:08:11 UTC (rev 384)
+++ trunk/scm/loader.scm	2005-01-28 22:19:09 UTC (rev 385)
@@ -1,41 +0,0 @@
-;;;
-;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
-;;;
-;;; All rights reserved.
-;;;
-;;; Redistribution and use in source and binary forms, with or without
-;;; modification, are permitted provided that the following conditions
-;;; are met:
-;;; 1. Redistributions of source code must retain the above copyright
-;;;    notice, this list of conditions and the following disclaimer.
-;;; 2. Redistributions in binary form must reproduce the above copyright
-;;;    notice, this list of conditions and the following disclaimer in the
-;;;    documentation and/or other materials provided with the distribution.
-;;; 3. Neither the name of authors nor the names of its contributors
-;;;    may be used to endorse or promote products derived from this software
-;;;    without specific prior written permission.
-;;;
-;;; THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-;;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-;;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-;;; ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-;;; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-;;; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-;;; OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-;;; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-;;; LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-;;; OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-;;; SUCH DAMAGE.
-;;;;
-
-(load "installed-modules.scm")
-
-(or (and (symbol-bound? 'per-user-enabled-im-list-loaded?)
-	 per-user-enabled-im-list-loaded?)
-    (and (symbol-bound? 'im-lazy-loading-enabled?)
-	 im-lazy-loading-enabled?
-	 (try-load "enabled-ims.scm"))
-    (begin
-      (for-each require-module installed-im-module-list)
-      (define enabled-im-list (reverse (cons 'direct
-					     (map im-name im-list))))))

Modified: trunk/uim/uim.c
===================================================================
--- trunk/uim/uim.c	2005-01-28 22:08:11 UTC (rev 384)
+++ trunk/uim/uim.c	2005-01-28 22:19:09 UTC (rev 385)
@@ -663,7 +663,7 @@
   uim_scm_require_file("plugin.scm");
   uim_scm_require_file("custom-rt.scm");
   uim_scm_require_file("im.scm");
-  uim_scm_load_file("loader.scm");
+  uim_scm_load_file("init.scm");
   /* must be loaded at last of IMs */
   UIM_EVAL_STRING(NULL, "(require-module \"direct\")");