(gethash (pointer-address pointer) *foreign-gobjects*)
(gethash (pointer-address pointer) *foreign-gobjects-ref-count*)
(ref-count pointer))
- (awhen (gethash (pointer-address pointer) *foreign-gobjects*)
- (setf (pointer it) nil)
- (cancel-finalization it))
+ (let ((object (gethash (pointer-address pointer) *foreign-gobjects*)))
+ (when object
+ (setf (pointer object) nil)
+ (cancel-finalization object)))
(remhash (pointer-address pointer) *foreign-gobjects*)
(remhash (pointer-address pointer) *foreign-gobjects-ref-count*)
(g-object-unref pointer))
(unless lisp-type
(error "Type ~A is not registered with REGISTER-OBJECT-TYPE"
(g-type-name g-type)))
+ (g-object-ref pointer)
(make-instance lisp-type :pointer pointer)))
(define-foreign-type foreign-g-object-type ()
(defmethod translate-to-foreign (object (type foreign-g-object-type))
(cond
+ ((null object)
+ (null-pointer))
+ ((pointerp object) object)
((null (pointer object))
(error "Object ~A has been disposed" object))
((typep object 'g-object)
nil
"Object ~A is not a subtype of ~A" object (sub-type type))
(pointer object))
- ((pointerp object) object)
(t (error "Object ~A is not translatable as GObject*" object))))
(defun get-g-object-for-pointer (pointer)
(unless (null-pointer-p pointer)
- (aif (gethash (pointer-address pointer) *foreign-gobjects*)
- (prog1 it
- (incf (gethash (pointer-address pointer) *foreign-gobjects-ref-count*))
- (debugf "increfering object ~A~%" pointer))
- (make-g-object-from-pointer pointer))))
+ (let ((object (gethash (pointer-address pointer) *foreign-gobjects*)))
+ (if object
+ (prog1 object
+ (incf (gethash (pointer-address pointer) *foreign-gobjects-ref-count*))
+ (debugf "increfering object ~A~%" pointer))
+ (make-g-object-from-pointer pointer)))))
(defmethod translate-from-foreign (pointer (type foreign-g-object-type))
(get-g-object-for-pointer pointer))
for arg-name in args-names
for arg-value in args-values
for arg-type in args-types
- for arg-g-type = (ensure-g-type arg-type)
+ for arg-g-type = (if arg-type (ensure-g-type arg-type) (g-object-type-property-type object-type arg-name))
for parameter = (mem-aref parameters 'g-parameter i)
do (setf (foreign-slot-value parameter 'g-parameter 'name) arg-name)
do (set-g-value (foreign-slot-value parameter 'g-parameter 'value)