Moved object user data from gtk to glib

[clg] / glib / glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index 4af0e940da36ddbba5c7f3c573b8e9b67b0beeba..1d4e200f11e41331b54458013f9b6562ca5c381b 100644 (file)
--- a/glib/glib.lisp
+++ b/glib/glib.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: glib.lisp,v 1.3 2000-08-22 23:13:39 espen Exp $
+;; $Id: glib.lisp,v 1.5 2000-08-23 21:36:44 espen Exp $
 
 
 (in-package "GLIB")
@@ -54,7 +54,11 @@ (defun quark-from-object (object &key (test #'eq))
     (or
      (assoc-ref object (gethash hash-code *quark-from-object*) :test test)
      (let ((quark (%quark-get-reserved)))
-       (push (cons object quark) (gethash hash-code *quark-from-object*))
+       (setf
+       (gethash hash-code *quark-from-object*)
+       (append
+        (gethash hash-code *quark-from-object*)
+        (list (cons object quark))))
        (setf (gethash quark *quark-to-object*) object)
        quark))))
 
@@ -119,7 +123,7 @@ (deftype-method translate-to-alien double-list (type-spec list &optional copy)
 
 (deftype-method
     translate-from-alien
-    double-list (type-spec glist &optional (alloc :dynamic))
+    double-list (type-spec glist &optional (alloc :reference))
   (let ((element-type-spec (second (type-expand-to 'double-list type-spec))))
     `(let ((glist ,glist)
           (list nil))
@@ -129,7 +133,7 @@ (deftype-method
          ,(translate-from-alien
            element-type-spec `(glist-data tmp ,element-type-spec) alloc)
          list))
-       ,(when (eq alloc :dynamic)
+       ,(when (eq alloc :reference)
          '(glist-free glist))
        (nreverse list))))