Workaround for wrong topological sorting of auto defined types

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 6e4e4e0df3a490ca9cc16d9ec9592ed2238483b5..e5562380cece9dadc70e050e681093058d527f9f 100644 (file)
--- 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
 
 ;; 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.11 2002-03-24 12:50:30 espen Exp $
+;; $Id: gobject.lisp,v 1.12 2002-04-02 14:57:19 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -156,17 +156,17 @@ (defmethod compute-virtual-slot-accessors
               (%object-get-property object pname gvalue)
               (unwind-protect
                   (funcall
               (%object-get-property object pname gvalue)
               (unwind-protect
                   (funcall

-                   (intern-reader-function type) gvalue +gvalue-value-offset+)
+                   (intern-reader-function (type-from-number type-number)) gvalue +gvalue-value-offset+) ; temporary workaround for wrong topological sorting of types

                 (gvalue-free gvalue t)))))
        #'(lambda (value object)
           (with-gc-disabled
             (let ((gvalue (gvalue-new type-number)))
               (funcall
                 (gvalue-free gvalue t)))))
        #'(lambda (value object)
           (with-gc-disabled
             (let ((gvalue (gvalue-new type-number)))
               (funcall

-               (intern-writer-function type)
+               (intern-writer-function (type-from-number type-number)) ; temporary

                value gvalue +gvalue-value-offset+)
               (%object-set-property object pname gvalue)
               (funcall
                value gvalue +gvalue-value-offset+)
               (%object-set-property object pname gvalue)
               (funcall

-               (intern-destroy-function type)
+               (intern-destroy-function (type-from-number type-number)) ; temporary

                gvalue +gvalue-value-offset+)
               (gvalue-free gvalue nil)
               value)))))))
                gvalue +gvalue-value-offset+)
               (gvalue-free gvalue nil)
               value)))))))


@@ -220,9 +220,9 @@ (defun expand-gobject-type (type-number &optional options
           #'(lambda (param)
               (with-slots (name flags value-type documentation) param
                 (let* ((slot-name (default-slot-name name))
           #'(lambda (param)
               (with-slots (name flags value-type documentation) param
                 (let* ((slot-name (default-slot-name name))

-                       (slot-type (type-from-number value-type #|t|#))
+                       (slot-type value-type) ;(type-from-number value-type t))

                        (accessor
                        (accessor

-                        (default-slot-accessor class slot-name slot-type)))
+                        (default-slot-accessor class slot-name (type-from-number slot-type)))) ; temporary workaround for wrong topological sorting of types

                   `(,slot-name
                     :allocation :property
                     :pname ,name
                   `(,slot-name
                     :allocation :property
                     :pname ,name