Bug fix

[clg] / glib / gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 05ccca1f4547fb675a63794ab5138eee5892a47e..d83a3d8a9360c60e8c3c045a449852d826db9a8f 100644 (file)
--- a/glib/gparam.lisp
+++ b/glib/gparam.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: gparam.lisp,v 1.21 2006-04-25 22:12:48 espen Exp $
+;; $Id: gparam.lisp,v 1.25 2007-07-03 08:43:21 espen Exp $
 
 (in-package "GLIB")
 
@@ -32,7 +32,8 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defbinding (size-of-gvalue "size_of_gvalue") () unsigned-int))
 
 (defconstant +gvalue-size+ (size-of-gvalue))
-(defconstant +gvalue-value-offset+ (size-of 'type-number))
+(defconstant +gvalue-value-offset+ 
+  (max (size-of 'type-number) (type-alignment '(unsigned-byte 64))))
 
 (defbinding (%gvalue-init "g_value_init") () nil
   (value gvalue)
@@ -60,7 +61,20 @@ (defun gvalue-free (gvalue &optional (unset-p t))
     (deallocate-memory gvalue)))
 
 (defun gvalue-type (gvalue)
-  (type-from-number (ref-type-number gvalue)))
+  ;; We need to search for the for the most specific known type
+  ;; because internal types, unknown to Lisp, may be passed in GValues
+  (labels ((find-most-specific-known-type (type)
+            (or 
+             (type-from-number type)
+             (let ((parent (type-parent type)))
+               (unless (zerop parent)
+                 (find-most-specific-known-type parent))))))
+    (let ((type-number (ref-type-number gvalue)))
+      (unless (zerop type-number)
+       (or     
+        (find-most-specific-known-type type-number)
+        ;; This will signal an error if the type hierarchy is unknown
+        (type-from-number type-number t))))))
 
 (defun gvalue-get (gvalue)
   (funcall (reader-function (gvalue-type gvalue))