From 98d3022bd45e03ddf06c4cf4bac2fba5d40f59ae Mon Sep 17 00:00:00 2001 From: Dmitry Kalyanov Date: Sun, 12 Jul 2009 22:39:16 +0400 Subject: [PATCH] Really move GValue GObject parsing code --- glib/gobject.foreign-gobject.lisp | 6 ++++++ glib/gobject.gvalue-parser.lisp | 2 -- glib/gobject.gvalue.lisp | 8 -------- 3 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 glib/gobject.gvalue-parser.lisp diff --git a/glib/gobject.foreign-gobject.lisp b/glib/gobject.foreign-gobject.lisp index 1427c39..7ce2814 100644 --- a/glib/gobject.foreign-gobject.lisp +++ b/glib/gobject.foreign-gobject.lisp @@ -201,6 +201,12 @@ (etypecase object (g-object (pointer object))))) +(defun parse-gvalue-object (gvalue) + (get-g-object-for-pointer (g-value-get-object gvalue))) + +(defun set-gvalue-object (gvalue value) + (g-value-set-object gvalue (if value (pointer value) (null-pointer)))) + (defmethod parse-gvalue-for-type (gvalue-ptr (type-numeric (eql +g-type-object+))) (parse-gvalue-object gvalue-ptr)) diff --git a/glib/gobject.gvalue-parser.lisp b/glib/gobject.gvalue-parser.lisp deleted file mode 100644 index ea87d55..0000000 --- a/glib/gobject.gvalue-parser.lisp +++ /dev/null @@ -1,2 +0,0 @@ -(in-package :gobject) - diff --git a/glib/gobject.gvalue.lisp b/glib/gobject.gvalue.lisp index b9009af..9f0063f 100644 --- a/glib/gobject.gvalue.lisp +++ b/glib/gobject.gvalue.lisp @@ -157,11 +157,3 @@ (unless flags-type (error "Flags ~A is not registered" type-name)) (g-value-set-flags gvalue (convert-to-foreign value flags-type)))) - -;;Objects - -(defun parse-gvalue-object (gvalue) - (get-g-object-for-pointer (g-value-get-object gvalue))) - -(defun set-gvalue-object (gvalue value) - (g-value-set-object gvalue (if value (pointer value) (null-pointer)))) -- 1.7.10.4