[uim-commit] r1452 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-09-07 07:58:52 -0700 (Wed, 07 Sep 2005)
New Revision: 1452

Modified:
   trunk/scm/im-custom.scm
   trunk/scm/im.scm
   trunk/scm/uim-module-manager.scm
Log:
* Proposed fix for bug #4363.
* scm/im.scm (system-available-im-list) : New.
* scm/im-custom.scm (usable-im-list) : New function to get the
  default value for enabled-im-list.
* scm/uim-module-manager.scm (update-installed-modules-scm) :
  Define system-available-im-list as enabled-im-list.


Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm	2005-09-07 14:46:44 UTC (rev 1451)
+++ trunk/scm/im-custom.scm	2005-09-07 14:58:52 UTC (rev 1452)
@@ -209,7 +209,16 @@
       (custom-im-list-as-choice-rec (reverse
 				     (alist-delete 'direct im-list eq?))))))
 
-(define-custom 'enabled-im-list '(direct)
+(define usable-im-list
+  (lambda ()
+    (let ((imlist (filter
+		    (lambda (name)
+	              (memq name system-available-im-list)) enabled-im-list)))
+	 (if (not (null? imlist))
+	     imlist
+	     '(direct)))))
+
+(define-custom 'enabled-im-list (usable-im-list)
   '(global im-deployment)
   (cons
    'ordered-list

Modified: trunk/scm/im.scm
===================================================================
--- trunk/scm/im.scm	2005-09-07 14:46:44 UTC (rev 1451)
+++ trunk/scm/im.scm	2005-09-07 14:58:52 UTC (rev 1452)
@@ -62,6 +62,7 @@
 ;; initialized. This limitation may be removed after uim 0.4.6.
 ;;   -- YamaKen 2005-01-25
 (define enabled-im-list ())
+(define system-available-im-list ())
 
 (define-record 'im
   (list

Modified: trunk/scm/uim-module-manager.scm
===================================================================
--- trunk/scm/uim-module-manager.scm	2005-09-07 14:46:44 UTC (rev 1451)
+++ trunk/scm/uim-module-manager.scm	2005-09-07 14:58:52 UTC (rev 1452)
@@ -111,7 +111,8 @@
       (custom-list-as-literal installed-im-module-list)
       ")\n"
       (custom-definition-as-literal 'enabled-im-list)
-      "\n"))))
+      "\n"
+      "(define system-available-im-list enabled-im-list)\n"))))
 
 
 (prealloc-heaps-for-heavy-job)