WITH-GVALUE now uses WITH-ALLOCATED-MEMORY

[clg] / glib / gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index fb1fef1fd6c3ca12ac669c5e78aa819667aaf3f3..86fe82c65f146de47237b9b5f6aa6ae9b078a00f 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.19 2006-02-06 18:12:19 espen Exp $
+;; $Id: gparam.lisp,v 1.20 2006-02-15 09:55:50 espen Exp $
 
 (in-package "GLIB")
 
@@ -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 ()