X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/62f128081bd450f55d7e4ffd6602fb518f8ea304..af6d8c9a08ff89387edfb843e6863458e2d51b2c:/glib/gobject.lisp?ds=sidebyside

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index a722174..10def18 100644
--- a/glib/gobject.lisp
+++ b/glib/gobject.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: gobject.lisp,v 1.30 2005-02-01 15:24:52 espen Exp $
+;; $Id: gobject.lisp,v 1.32 2005-02-10 00:20:02 espen Exp $
 
 (in-package "GLIB")
 
@@ -26,8 +26,7 @@
   (defclass gobject-class (ginstance-class)
     ())
 
-  (defmethod validate-superclass ((class gobject-class)
-				(super pcl::standard-class))
+  (defmethod validate-superclass ((class gobject-class) (super standard-class))
 ;  (subtypep (class-name super) 'gobject)
     t))
 
@@ -109,10 +108,10 @@
     (when (and (not (slot-boundp slotd 'getter)) (slot-readable-p slotd))
       (setf 
        (slot-value slotd 'getter)
-       (let ((reader nil))
+       (let ((reader nil)) ;(reader-function type)))
 	 #'(lambda (object)
 	     (unless reader
-	       (setq reader (reader-function type))) ;(type-from-number type-number))))
+	       (setq reader (reader-function type)))
 	     (let ((gvalue (gvalue-new type-number)))
 	       (%object-get-property object pname gvalue)
 	       (unwind-protect
@@ -122,10 +121,10 @@
     (when (and (not (slot-boundp slotd 'setter)) (slot-writable-p slotd))
       (setf 
        (slot-value slotd 'setter)
-       (let ((writer nil))
+       (let ((writer nil)) ;(writer-function type)))
 	 #'(lambda (value object)
 	     (unless writer
-	       (setq writer (writer-function type))) ;(type-from-number type-number))))
+	       (setq writer (writer-function type)))
 	     (let ((gvalue (gvalue-new type-number)))
 	       (funcall writer value gvalue +gvalue-value-offset+)
 	       (%object-set-property object pname gvalue)
@@ -277,9 +276,14 @@
   (data unsigned-long)
   (destroy-marshal pointer))
 
+(defcallback user-data-destroy-func (nil (id unsigned-int))
+  (destroy-user-data id))
+
+(export 'user-data-destroy-func)
+
 (defun (setf user-data) (data object key)
   (%object-set-qdata-full object (quark-intern key)
-   (register-user-data data) (callback %destroy-user-data))
+   (register-user-data data) (callback user-data-destroy-func))
   data)
 
 ;; deprecated
@@ -334,9 +338,10 @@
     (unwind-protect
 	 (multiple-value-bind (array length)
 	     (%object-class-list-properties class)
-	   (unwind-protect
-		(%map-params array length type-number inherited-p)
-	     (deallocate-memory array)))
+	   (unless (null-pointer-p array)
+	     (unwind-protect
+		 (%map-params array length type-number inherited-p)
+	       (deallocate-memory array))))
 ;      (type-class-unref type-number)
       )))
 
@@ -426,7 +431,12 @@
       (:alien-name ,(find-type-name type)))))
 
 (defun gobject-dependencies (type)
-  (delete-duplicates (mapcar #'param-value-type (query-object-class-properties type))))
+  (delete-duplicates 
+   (cons
+    (supertype type)
+    (append 
+     (type-interfaces type)
+     (mapcar #'param-value-type (query-object-class-properties type))))))
 
 
 (register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-dependencies)