Fixed function names in gtk, removed duplicated function defintions in gtk

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

diff --git a/glib/gobject.foreign-gobject.lisp b/glib/gobject.foreign-gobject.lisp
index a4cad2b..d02bea8 100644 (file)
--- a/glib/gobject.foreign-gobject.lisp
+++ b/glib/gobject.foreign-gobject.lisp
@@ -149,6 +149,7 @@
     (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 ()
@@ -160,6 +161,9 @@
 
 (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)
@@ -167,7 +171,6 @@
              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)
@@ -248,7 +251,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)