Removed dependency of some internal PCL symbols

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index ef4bd03..bdc6c18 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.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: gtkobject.lisp,v 1.28 2006-02-03 12:47:00 espen Exp $
+;; $Id: gtkobject.lisp,v 1.31 2006-02-15 09:47:42 espen Exp $
 
 
 (in-package "GTK")
@@ -60,7 +60,7 @@
   (call-next-method)
   ;; Add a temorary reference which will be removed when the object is
   ;; sinked
-  (reference-foreign (class-of object) (proxy-location object))
+  (reference-foreign (class-of object) (foreign-location object))
   (%object-sink object))
 
 (defbinding %object-sink () nil
@@ -125,9 +125,11 @@
     (t (call-next-method))))
 
 (defmethod compute-effective-slot-definition-initargs ((class child-class) direct-slotds)
-  (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+  (if (eq (slot-definition-allocation (first direct-slotds)) :property)
       (nconc 
        (list :pname (most-specific-slot-value direct-slotds 'pname))
+       ;; Need this to prevent type expansion in SBCL (>= 0.9.8)
+       (list :type (most-specific-slot-value direct-slotds 'type))
        (call-next-method))
     (call-next-method)))