Added missing type expansion

[clg] / glib / gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index d4a4921..373a5ee 100644 (file)
--- a/glib/gtype.lisp
+++ b/glib/gtype.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtype.lisp,v 1.47 2006-02-26 15:30:01 espen Exp $
+;; $Id: gtype.lisp,v 1.49 2006-03-06 20:57:08 espen Exp $
 
 (in-package "GLIB")
 
@@ -30,7 +30,7 @@
 (defbinding type-init () nil)
 (type-init)
 
-(deftype type-number () '(unsigned 32))
+(deftype type-number () 'unsigned-long)
 
 (deftype gtype () 'symbol)
 
@@ -197,7 +197,8 @@
       (unwind-protect
          (loop 
           as symbol = (let ((line (read-line (process-output process) nil)))
-                        (when line (subseq line 11)))                    
+                        (when line 
+                          (subseq line (1+ (position #\Space line :from-end t)))))
           while symbol
           when (and
                 (> (length symbol) 9)
@@ -385,9 +386,10 @@
   (error "Doing copy-from-alien on a ref. counted class is most certainly an error, but if it really is what you want you should use REFERENCE-FOREIGN on the returned instance instead."))
 
 (define-type-method reader-function ((type ginstance))
-  #'(lambda (location &optional (offset 0) weak-p)
-      (declare (ignore weak-p))
-      (ensure-proxy-instance type (sap-ref-sap location offset))))
+  (let ((class (type-expand type)))
+    #'(lambda (location &optional (offset 0) weak-p)
+       (declare (ignore weak-p))
+       (ensure-proxy-instance class (sap-ref-sap location offset)))))
 
 
 ;;;; Registering fundamental types