Replaced WEAK-READER-FUNCTION with optional WEAK-P argument to standard reader functions

[clg] / glib / gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 7c1ab5e42b628335d0fd530839ab627ce13c0e82..fb1fef1fd6c3ca12ac669c5e78aa819667aaf3f3 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.18 2006-02-06 11:56:22 espen Exp $
+;; $Id: gparam.lisp,v 1.19 2006-02-06 18:12:19 espen Exp $
 
 (in-package "GLIB")
 
@@ -64,13 +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+))
-
-(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))