From 0090bb5e2bc151f884d4a3f04b94d9eb2d8260d6 Mon Sep 17 00:00:00 2001 Message-Id: <0090bb5e2bc151f884d4a3f04b94d9eb2d8260d6.1715251893.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 3 Feb 2006 00:41:01 +0000 Subject: [PATCH] Made toggle reference depend on glib2.8 Organization: Straylight/Edgeware From: espen --- glib/gobject.lisp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/glib/gobject.lisp b/glib/gobject.lisp index 755326f..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.39 2006-02-03 00:10:56 espen Exp $ +;; $Id: gobject.lisp,v 1.40 2006-02-03 00:41:01 espen Exp $ (in-package "GLIB") @@ -66,13 +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))) -#+gtk2.8 +#+glib2.8 (defbinding %object-add-toggle-ref () pointer (location pointer) ((callback toggle-ref-callback) pointer) (nil null)) -#+gtk2.8 +#+glib2.8 (defbinding %object-remove-toggle-ref () pointer (location pointer) ((callback toggle-ref-callback) pointer) @@ -80,11 +80,11 @@ (defbinding %object-remove-toggle-ref () pointer (defmethod reference-foreign ((class gobject-class) location) (declare (ignore class)) - #+gtk2.8 + #+glib2.8 (if (slot-value class 'instance-slots-p) (%object-add-toggle-ref location) (%object-ref location)) - #-gtk2.8 + #-glib2.8 (%object-ref location)) (defmethod unreference-foreign ((class gobject-class) location) @@ -269,7 +269,7 @@ (defmethod initialize-instance ((object gobject) &rest initargs) (defmethod instance-finalizer ((instance gobject)) (let ((location (proxy-location instance))) - #+gtk2.8 + #+glib2.8 (if (slot-value (class-of instance) 'instance-slots-p) #'(lambda () (remove-cached-instance location) @@ -277,7 +277,7 @@ (defmethod instance-finalizer ((instance gobject)) #'(lambda () (remove-cached-instance location) (%object-unref location))) - #-gtk2.8 + #-glib2.8 #'(lambda () (remove-cached-instance location) (%object-unref location)))) -- [mdw]