Bug fixes

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index a0631dc8bff8b0d6a2a5eebe21c4c7d97776de89..59066daa449da4b71520debdda37d3bef391ad93 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.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.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gobject.lisp,v 1.50 2006-02-26 15:30:01 espen Exp $
+;; $Id: gobject.lisp,v 1.51 2006-03-03 10:01:01 espen Exp $

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


@@ -557,17 +557,17 @@ (register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-depend
 ;;; Pseudo type for gobject instances which have their reference count
 ;;; increased by the returning function
 
 ;;; Pseudo type for gobject instances which have their reference count
 ;;; increased by the returning function
 

-;; (deftype referenced (type) type)
+(deftype referenced (type) type)

 
 (define-type-method alien-type ((type referenced))
   (declare (ignore type))
   (alien-type 'gobject))
 
 (define-type-method from-alien-form ((type referenced) form)
 
 (define-type-method alien-type ((type referenced))
   (declare (ignore type))
   (alien-type 'gobject))
 
 (define-type-method from-alien-form ((type referenced) form)

-  (let ((type (second type)))
+  (let ((class (second (type-expand-to 'referenced type))))

     (if (subtypep type 'gobject)
        (let ((instance (make-symbol "INSTANCE")))
     (if (subtypep type 'gobject)
        (let ((instance (make-symbol "INSTANCE")))

-         `(let ((,instance ,(from-alien-form type form)))
+         `(let ((,instance ,(from-alien-form class form)))

             (when ,instance
               (%object-unref (foreign-location ,instance)))
             ,instance))
             (when ,instance
               (%object-unref (foreign-location ,instance)))
             ,instance))