Bug fix

[clg] / glib / gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 797709cf3fc86243d99bc4f813aba25b8099774c..a923b5d3f9d3f39434011e783322750eaaa7be39 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.
 
 ;; 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.23 2007/05/10 20:26:33 espen Exp $
+;; $Id: gparam.lisp,v 1.25 2007/07/03 08:43:21 espen Exp $

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


@@ -33,7 +33,7 @@   (defbinding (size-of-gvalue "size_of_gvalue") () unsigned-int))
 
 (defconstant +gvalue-size+ (size-of-gvalue))
 (defconstant +gvalue-value-offset+ 
 
 (defconstant +gvalue-size+ (size-of-gvalue))
 (defconstant +gvalue-value-offset+ 

-  (max (size-of 'type-number) (type-alignment 'type-number)))
+  (max (size-of 'type-number) (type-alignment '(unsigned-byte 64))))

 
 (defbinding (%gvalue-init "g_value_init") () nil
   (value gvalue)
 
 (defbinding (%gvalue-init "g_value_init") () nil
   (value gvalue)


@@ -69,10 +69,12 @@ (defun gvalue-type (gvalue)
              (let ((parent (type-parent type)))
                (unless (zerop parent)
                  (find-most-specific-known-type parent))))))
              (let ((parent (type-parent type)))
                (unless (zerop parent)
                  (find-most-specific-known-type parent))))))

-    (or
-     (find-most-specific-known-type (ref-type-number gvalue))
-     ;; This will signal an error if the type hierarchy is unknown
-     (type-from-number (ref-type-number gvalue) t))))
+    (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))
 
 (defun gvalue-get (gvalue)
   (funcall (reader-function (gvalue-type gvalue))