X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/dfa4f31424800fdb6fb63514121b9cc893269276..73383a9efec7360f61b9ef544fdba3db61b2dd10:/glib/gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 5b5bf4e..f354992 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.34 2005-03-06 17:26:23 espen Exp $
+;; $Id: gobject.lisp,v 1.35 2005-03-11 10:56:58 espen Exp $
 
 (in-package "GLIB")
 
@@ -332,7 +332,7 @@ (defun %map-params (params length type inherited-p)
       (nreverse properties))))
 
 (defun query-object-class-properties (type &optional inherited-p)
-  (let* ((type-number (find-type-number type))
+  (let* ((type-number (find-type-number type t))
 	 (class (type-class-ref type-number)))
     (unwind-protect
 	 (multiple-value-bind (array length)
@@ -364,8 +364,9 @@ (defun slot-definition-from-property (class property &optional slot-name args)
       `(,slot-name
 	:allocation :property :pname ,name
 
-	,@(cond
-	   ((find :unbound args) (list :unbound (getf args :unbound))))
+	,@(when (find :unbound args) (list :unbound (getf args :unbound)))
+	,@(when (find :getter args) (list :getter (getf args :getter)))
+	,@(when (find :setter args) (list :setter (getf args :setter)))
 	
 	;; accessors
 	,@(cond
@@ -427,10 +428,10 @@ (defun expand-gobject-type (type forward-p options &optional (metaclass 'gobject
 	(class  (type-from-number type))
 	(slots (getf options :slots)))    
     `(defclass ,class ,supers
-       ,(unless forward-p
-	  (slot-definitions class (query-object-class-properties type) slots))
-      (:metaclass ,metaclass)
-      (:gtype ,(find-type-init-function type)))))
+	 ,(unless forward-p
+	    (slot-definitions class (query-object-class-properties type) slots))
+	 (:metaclass ,metaclass)
+	 (:gtype ,(register-type-as type)))))
 
 (defun gobject-dependencies (type)
   (delete-duplicates