Made toggle reference depend on glib2.8

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 755326fa01b1d353f68a50663f36b5eea7766699..b8100c609107e869368f563f6cad00329dec4762 100644 (file)
--- 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.
 
 ;; 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")
 
 
 (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)))
 
       (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))
 
 (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)
 (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))
 
 (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))
   (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)
   (%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)))
 
 (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)
     (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)))
       #'(lambda ()
          (remove-cached-instance location)
          (%object-unref location)))

-    #-gtk2.8
+    #-glib2.8

     #'(lambda ()
        (remove-cached-instance location)
          (%object-unref location))))
     #'(lambda ()
        (remove-cached-instance location)
          (%object-unref location))))