get-g-flags-definition should call to register-flags-type, not register-enum-type...

[cl-gtk2.git] / glib / gobject.foreign-gobject.lisp

diff --git a/glib/gobject.foreign-gobject.lisp b/glib/gobject.foreign-gobject.lisp
index 0ea990a..33b8434 100644 (file)
--- a/glib/gobject.foreign-gobject.lisp
+++ b/glib/gobject.foreign-gobject.lisp
@@ -115,9 +115,10 @@
           (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))
@@ -163,6 +164,7 @@
   (cond
     ((null object)
      (null-pointer))
+    ((pointerp object) object)
     ((null (pointer object))
      (error "Object ~A has been disposed" object))
     ((typep object 'g-object)
@@ -170,16 +172,16 @@
              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))
@@ -251,7 +253,7 @@
          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)