X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/110bd96ce6f2ff1aa4f25f899e12a5c3e3125f61..953030a3519ecb9d66d9f55d46f8c8b6906094ed:/glib/gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 6b4bf1b..ea3fa44 100644
--- 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.24 2007-06-01 06:18:59 espen Exp $
+;; $Id: gparam.lisp,v 1.26 2007-08-20 10:50:25 espen Exp $
 
 (in-package "GLIB")
 
@@ -42,10 +42,10 @@
 (defbinding (gvalue-unset "g_value_unset") () nil
   (value gvalue))
 
-(defun gvalue-init (gvalue type &optional (value nil value-p))
+(defun gvalue-init (gvalue type &optional (value nil value-p) temp-p)
   (%gvalue-init gvalue (find-type-number type))
   (when value-p
-    (funcall (writer-function type) value gvalue +gvalue-value-offset+)))
+    (funcall (writer-function type :temp temp-p) value gvalue +gvalue-value-offset+)))
 
 (defun gvalue-new (&optional type (value nil value-p))
   (let ((gvalue (allocate-memory +gvalue-size+)))
@@ -69,10 +69,12 @@
 	      (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))
@@ -97,7 +99,7 @@
 (defmacro with-gvalue ((gvalue &optional type (value nil value-p)) &body body)
   `(with-memory (,gvalue +gvalue-size+)
      ,(cond
-       ((and type value-p) `(gvalue-init ,gvalue ,type ,value))
+       ((and type value-p) `(gvalue-init ,gvalue ,type ,value t))
        (type `(gvalue-init ,gvalue ,type)))
      ,@body
      ,(unless value-p `(gvalue-take ,gvalue))))