X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/55212af123daea1d86d31da21cc1bee77651fb81..bdf1567aa37a86469f0825e0ccc87d34039b7c4b:/glib/gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 5e63b2b..cb75086 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.17 2005/04/23 16:48:51 espen Exp $
+;; $Id: gparam.lisp,v 1.20 2006/02/15 09:55:50 espen Exp $
 
 (in-package "GLIB")
 
@@ -64,9 +64,9 @@ (defun gvalue-free (gvalue &optional (unset-p t))
 (defun gvalue-type (gvalue)
   (type-from-number (sap-ref-32 gvalue 0)))
 
-(defun gvalue-get (gvalue)
+(defun gvalue-get (gvalue &optional weak-p)
   (funcall (reader-function (gvalue-type gvalue))
-   gvalue +gvalue-value-offset+))
+   gvalue +gvalue-value-offset+ weak-p))
 
 (defun gvalue-set (gvalue value)
   (funcall (writer-function (gvalue-type gvalue))
@@ -77,15 +77,12 @@ (defbinding (gvalue-p "g_type_check_value") () boolean
   (location pointer))
 
 (defmacro with-gvalue ((gvalue &optional type (value nil value-p)) &body body)
-  `(let ((,gvalue ,(cond
-		    ((and type value-p) `(gvalue-new ,type ,value))
-		    (type `(gvalue-new ,type))
-		    (`(gvalue-new)))))
-    (unwind-protect
-	 (progn
-	   ,@body
-	   ,(unless value-p `(gvalue-get ,gvalue)))
-      (gvalue-free ,gvalue))))
+  `(with-allocated-memory (,gvalue +gvalue-size+)
+     ,(cond
+       ((and type value-p) `(gvalue-init ,gvalue ,type ,value))
+       (type `(gvalue-init ,gvalue ,type)))
+     ,@body
+     ,(unless value-p `(gvalue-get ,gvalue))))
 
 
 (deftype param-flag-type ()