From 8a2470dd09b8822bfcf11d5fbe965c02343557d5 Mon Sep 17 00:00:00 2001 Message-Id: <8a2470dd09b8822bfcf11d5fbe965c02343557d5.1715496049.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 28 Feb 2006 00:11:24 +0000 Subject: [PATCH] Bug fixes Organization: Straylight/Edgeware From: espen --- glib/ginterface.lisp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp index a0fde4d..4ec9dd7 100644 --- a/glib/ginterface.lisp +++ b/glib/ginterface.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: ginterface.lisp,v 1.15 2006-02-26 15:30:01 espen Exp $ +;; $Id: ginterface.lisp,v 1.16 2006-02-28 00:11:24 espen Exp $ (in-package "GLIB") @@ -61,15 +61,13 @@ (defmethod compute-effective-slot-definition-initargs ((class ginterface-class) (defmethod shared-initialize ((class ginterface-class) names &key name gtype) (declare (ignore names)) - (let* ((class-name (or name (class-name class))) -;; (type-number -;; (or -;; (find-type-number class-name) -;; (register-type class-name -;; (or (first gtype) (default-type-init-name class-name))))) - ) -; (type-default-interface-ref type-number) - ) + (let* ((class-name (or name (class-name class))) + (type-number + (or + (find-type-number class-name) + (register-type class-name + (or (first gtype) (default-type-init-name class-name)))))) + (type-default-interface-ref type-number)) (call-next-method)) @@ -120,8 +118,8 @@ (define-type-method destroy-function ((type ginterface)) (defbinding type-default-interface-ref (type) pointer ((find-type-number type t) type-number)) -(defbinding type-default-interface-unref (type) nil - ((find-type-number type t) type-number)) +(defbinding type-default-interface-unref () nil + (iface pointer)) (defbinding type-default-interface-peek (type) pointer ((find-type-number type t) type-number)) @@ -140,8 +138,7 @@ (defun query-object-interface-properties (type &optional inherited-p) (unwind-protect (%map-params array length type-number inherited-p) (deallocate-memory array)))) -; (type-default-interface-unref type-number) - ))) + (type-default-interface-unref iface)))) (defun expand-ginterface-type (type forward-p options &rest args) -- [mdw]