X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/832df308727989ce3b1a0572d5742f1f3017f362..58ed74395e06d538219f88da13268408be35f8f8:/glib/gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 7c1ab5e..86fe82c 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.18 2006-02-06 11:56:22 espen Exp $
+;; $Id: gparam.lisp,v 1.20 2006-02-15 09:55:50 espen Exp $
 
 (in-package "GLIB")
 
@@ -64,13 +64,9 @@
 (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+))
-
-(defun gvalue-weak-get (gvalue)  
-  (funcall (weak-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))
@@ -81,15 +77,12 @@
   (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 ()