[gtk-cffi-cvs] CVS gtk-cffi/g-object

[CVS User rklochkov]

Update of /project/gtk-cffi/cvsroot/gtk-cffi/g-object
In directory tiger.common-lisp.net:/tmp/cvs-serv2591/g-object

Modified Files:
	defslots.lisp g-object.lisp g-type.lisp pobject.lisp 
Log Message:
Synced with current version of CFFI


--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/defslots.lisp	2012/05/07 09:02:04	1.12
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/defslots.lisp	2012/08/12 17:42:30	1.13
@@ -148,7 +148,7 @@
         (cb-name (gensym)))
   `(progn
      (defcfun ,gtk-name :void
-       (,class pobject) (func pfunction) (data (pdata :free :all)))
+       (,class pobject) (func pfunction) (data (pdata :free-to-foreign t)))
      (defcallback ,cb-name :void ,params ;((tag pobject) (data pdata))
        (funcall *callback* ,@(mapcar #'car params)))
      (defmethod foreach ((,class ,class) func &optional data)
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-object.lisp	2012/07/29 16:11:54	1.12
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-object.lisp	2012/08/12 17:42:30	1.13
@@ -10,8 +10,8 @@
 (defclass g-object (object)
   ((signals :accessor gsignals :initform nil)
    ;; redefining VOLATILE for saving in hash
-   (cffi-objects::volatile :initform nil)
-   (cffi-objects::free-after :initform nil)
+   (volatile :initform nil)
+   (free-after :initform nil)
    (%properties :accessor %properties :initform nil :allocation :class))
   (:documentation "Lisp wrapper for GObject"))
 
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-type.lisp	2012/05/07 09:02:04	1.7
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-type.lisp	2012/08/12 17:42:30	1.8
@@ -31,12 +31,13 @@
 
 (defcstruct g-type-instance
   "GTypeInstance"
-  (g-class (:pointer g-type-class)))
+  (g-class (:pointer (:struct g-type-class))))
+
 
 (defun g-type-from-instance (ptr)
   (foreign-slot-value 
-   (foreign-slot-value ptr 'g-type-instance 'g-class)
-   'g-type-class 'g-type))
+   (foreign-slot-value ptr '(:struct g-type-instance) 'g-class)
+   '(:struct g-type-class) 'g-type))
 
 (defcfun g-type-fundamental g-type (id g-type))
 (defcfun g-type-from-name g-type (name :string))
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/pobject.lisp	2012/07/29 15:13:59	1.8
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/pobject.lisp	2012/08/12 17:42:30	1.9
@@ -53,7 +53,7 @@
 
 
 (define-foreign-type cffi-pdata (cffi-pobject freeable-base)
-  ((free :initform :none))
+  ((free-to-foreign :initform nil))
   (:actual-type :pointer)
   (:simple-parser pdata)
   (:documentation "PDATA lets send any data via a c-pointer. C-pointer used as