From 646466b05f81b2c3c791f5ff7ee33c3f61c2e42a Mon Sep 17 00:00:00 2001 Message-Id: <646466b05f81b2c3c791f5ff7ee33c3f61c2e42a.1715100654.git.mdw@distorted.org.uk> From: Mark Wooding Date: Wed, 12 Jan 2005 13:26:03 +0000 Subject: [PATCH] Bug fix Organization: Straylight/Edgeware From: espen --- glib/gobject.lisp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glib/gobject.lisp b/glib/gobject.lisp index f1f04d3..c6bfe26 100644 --- a/glib/gobject.lisp +++ b/glib/gobject.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gobject.lisp,v 1.27 2005-01-03 16:40:45 espen Exp $ +;; $Id: gobject.lisp,v 1.28 2005-01-12 13:26:03 espen Exp $ (in-package "GLIB") @@ -345,9 +345,9 @@ (defun default-slot-accessor (class-name slot-name type) (if (eq type 'boolean) "-P" "")))) -(defun slot-definition-from-property (class property &optional args) +(defun slot-definition-from-property (class property &optional slot-name args) (with-slots (name flags value-type documentation) property - (let* ((slot-name (default-slot-name name)) + (let* ((slot-name (or slot-name (default-slot-name name))) (slot-type (or (getf args :type) (type-from-number value-type) value-type)) (accessor (default-slot-accessor class slot-name slot-type))) @@ -405,7 +405,7 @@ (defun slot-definitions (class properties slots) ((getf (rest slot) :merge) (setf (rest slot) - (rest (slot-definition-from-property class property (rest slot))))))) + (rest (slot-definition-from-property class property (first slot) (rest slot))))))) (delete-if #'(lambda (slot) (getf (rest slot) :ignore)) slots)) -- [mdw]