X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/b036d261787becf25cf92cc413d920d7fec3a9ea..0090bb5e2bc151f884d4a3f04b94d9eb2d8260d6:/glib/gobject.lisp?ds=sidebyside

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index e3f91f0..b8100c6 100644
--- a/glib/gobject.lisp
+++ b/glib/gobject.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: gobject.lisp,v 1.37 2006-02-02 19:51:33 espen Exp $
+;; $Id: gobject.lisp,v 1.40 2006-02-03 00:41:01 espen Exp $
 
 (in-package "GLIB")
 
@@ -66,11 +66,13 @@ (defcallback toggle-ref-callback (nil (data pointer) (location pointer) (last-re
       (cache-instance (find-cached-instance location) t)
     (cache-instance (find-cached-instance location) nil)))
 
+#+glib2.8
 (defbinding %object-add-toggle-ref () pointer
   (location pointer)
   ((callback toggle-ref-callback) pointer)
   (nil null))
 
+#+glib2.8
 (defbinding %object-remove-toggle-ref () pointer
   (location pointer)
   ((callback toggle-ref-callback) pointer)
@@ -78,9 +80,12 @@ (defbinding %object-remove-toggle-ref () pointer
 
 (defmethod reference-foreign ((class gobject-class) location)
   (declare (ignore class))
+  #+glib2.8
   (if (slot-value class 'instance-slots-p)
       (%object-add-toggle-ref location)
-    (%object-ref location)))
+    (%object-ref location))
+  #-glib2.8
+  (%object-ref location))
 
 (defmethod unreference-foreign ((class gobject-class) location)
   (declare (ignore class))
@@ -182,7 +187,7 @@ (defmethod shared-initialize :after ((class gobject-class) names &rest initargs)
   (when (some #'(lambda (slotd)
 		  (and
 		   (eq (slot-definition-allocation slotd) :instance)
-		   (not (eq (slot-definition-name slotd) 'location))))
+		   (not (typep slotd 'effective-special-slot-definition))))
 	      (class-slots class))
     (setf (slot-value class 'instance-slots-p) t)))
 
@@ -264,13 +269,18 @@ (defmethod initialize-instance ((object gobject) &rest initargs)
 
 (defmethod instance-finalizer ((instance gobject))
   (let ((location (proxy-location instance)))
+    #+glib2.8
     (if (slot-value (class-of instance) 'instance-slots-p)
 	#'(lambda ()
 	    (remove-cached-instance location)
 	    (%object-remove-toggle-ref location))
       #'(lambda ()
 	  (remove-cached-instance location)
-	  (%object-unref location)))))
+	  (%object-unref location)))
+    #-glib2.8
+    #'(lambda ()
+	(remove-cached-instance location)
+	  (%object-unref location))))
 
 
 (defbinding (%gobject-new "g_object_new") () pointer