From 4ed72c9e6fcc42e6a9726bb733ea04f44fcc7668 Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 2 Sep 2003 23:37:49 +0000 Subject: [PATCH] * Fixed xwidgets.scm to work with xm.so. git-svn-id: svn://svn.zoy.org/elk/trunk@70 55e467fa-43c5-0310-a8a2-de718669efc6 --- scm/xwidgets.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scm/xwidgets.scm b/scm/xwidgets.scm index a8ae28f..de0c9d6 100644 --- a/scm/xwidgets.scm +++ b/scm/xwidgets.scm @@ -15,7 +15,8 @@ (define widget-aliases #f) (define (widget-loaded? w) - (feature? (string->symbol (format #f "~a:~a.so" widget-subdirectory w)))) + ;;(feature? (string->symbol (format #f "~a:~a.so" widget-subdirectory w)))) + (feature? (string->symbol (format #f "~a:~a.so" widget-subdirectory widget-subdirectory)))) (define-macro (load-widgets . w) (let ((wl '()) (l '())) @@ -44,9 +45,10 @@ (if alias (set! file (cdr alias))) (if autoload-notify? (format #t "~a~a" file (if (null? (cdr f)) "" " "))) + ;; XXX: don't load all widgets, they're all in the same lib ;;(set! wl (cons (format #f "~a/~a.so" widget-subdirectory file) - (set! wl (cons (format #f "~a/~a.so" widget-subdirectory widget-subdirectory) - wl)))) + ;; wl)))) + (set! wl (list (format #f "~a/~a.so" widget-subdirectory widget-subdirectory))))) (if autoload-notify? (format #t "]~%")) `(fluid-let ((load-libraries (if (feature? 'motif)