INIT-TYPES-IN-LIBRARY should now search for files in the default gtk libdir

[clg] / glib / gutils.lisp

diff --git a/glib/gutils.lisp b/glib/gutils.lisp
index 5d6e649dd804276c6696a50b280ee36aa0f1fb95..2558973712fa406f47027f65ca92743171adfbfd 100644 (file)
--- a/glib/gutils.lisp
+++ b/glib/gutils.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gutils.lisp,v 1.4 2001-04-29 20:01:54 espen Exp $
+;; $Id: gutils.lisp,v 1.9 2001-10-21 16:53:13 espen Exp $
 
 
 (in-package "KERNEL")
@@ -33,7 +33,6 @@ (defun type-expand-1 (form)
 
 (in-package "GLIB")
 
-
 (defun type-expand-to (type form)
   (labels ((expand (form0)
              (if (eq (first (mklist form0)) type)
@@ -50,7 +49,7 @@ (defmacro with-gc-disabled (&body body)
     `(progn
        (let ((,gc-inhibit lisp::*gc-inhibit*))
         (ext:gc-off)
-        (unwind-protect
+                (unwind-protect
             ,@body
           (unless ,gc-inhibit
             (ext:gc-on)))))))
@@ -112,6 +111,11 @@ (defun funcallable (object)
       (fdefinition object)
     object))
 
+(defun intersection-p (list1 list2 &key (test #'eq))
+  (dolist (obj list1 nil)
+    (when (member obj list2 :test test)
+      (return-from intersection-p t))))
+
 
 (defun split-string (string delimiter)
   (declare (simple-string string) (character delimiter))
@@ -142,4 +146,22 @@ (defun concatenate-strings (strings &optional delimiter)
      'string
      (first strings)
      (if delimiter (string delimiter) "")
-     (concatenate-strings (rest strings)))))
+     (concatenate-strings (rest strings) delimiter))))
+
+(defun string-prefix-p (prefix string)
+  (and
+   (>= (length string) (length prefix))
+   (string= prefix string :end2 (length prefix))))
+
+(defun get-all (plist property)
+  (multiple-value-bind (property value tail)
+      (get-properties plist (list property))
+    (when tail
+      (cons value (get-all (cddr tail) property)))))
+
+(defun plist-remove (plist property)
+  (when plist
+    (if (eq (first plist) property)
+       (plist-remove (cddr plist) property)
+      (list*
+       (first plist) (second plist) (plist-remove (cddr plist) property)))))