Correct reference counting of gobjects

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 79ce7dc781f7c54e50d5fe21577d7751710ff25d..1ecc1b46b7bd134a1391736cafd9ccf2ff0483c4 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gobject.lisp,v 1.15 2004-10-31 00:56:29 espen Exp $
+;; $Id: gobject.lisp,v 1.16 2004-11-03 16:18:16 espen Exp $
 
 (in-package "GLIB")
 
@@ -58,9 +58,27 @@ (defmethod initialize-instance ((object gobject) &rest initargs)
 ;    (map 'nil #'gvalue-free values)
     )
   
+  (%object-weak-ref object)
   (apply #'call-next-method object initargs))
 
 
+(defmethod initialize-proxy ((object gobject) &rest initargs &key weak-ref)
+  (declare (ignore initargs))
+  (call-next-method)
+  (%object-weak-ref object)
+  (unless weak-ref
+    (object-ref object)))
+
+(def-callback weak-notify (void (data int) (location system-area-pointer))
+  (when (instance-cached-p location)
+    (warn "~A being finalized by the GObject system while still in existence in lisp" (find-cached-instance location))
+    (remove-cached-instance location)))
+
+(defbinding %object-weak-ref (object) nil
+  (object gobject)
+  ((callback weak-notify) pointer)
+  (0 unsigned-int))
+
 
 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
@@ -121,7 +139,7 @@ (defbinding %object-set-qdata-full () nil
 (defun (setf object-data) (data object key &key (test #'eq))
   (%object-set-qdata-full
    object (quark-from-object key :test test)
-   (register-user-data data) *destroy-notify*)
+   (register-user-data data) (callback %destroy-user-data))
   data)
 
 (defbinding %object-get-qdata () unsigned-long