From 807228175c9db4f8f668a8b12123fb29e9d1a73f Mon Sep 17 00:00:00 2001 Message-Id: <807228175c9db4f8f668a8b12123fb29e9d1a73f.1715460268.git.mdw@distorted.org.uk> From: Mark Wooding Date: Wed, 27 Sep 2006 08:44:44 +0000 Subject: [PATCH] BUg fix Organization: Straylight/Edgeware From: espen --- glade-xml/glade-xml.lisp | 4 ++-- gtk/gtkwidget.lisp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glade-xml/glade-xml.lisp b/glade-xml/glade-xml.lisp index 97eb148..d7b28a7 100644 --- a/glade-xml/glade-xml.lisp +++ b/glade-xml/glade-xml.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: glade-xml.lisp,v 1.1 2006-09-05 13:55:01 espen Exp $ +;; $Id: glade-xml.lisp,v 1.2 2006-09-27 08:44:44 espen Exp $ (in-package "GLADE-XML") @@ -201,7 +201,7 @@ (defun connect-signals (widgets toplevels) do (loop for signal in (user-data widget 'signals) - do (destructuring-bind (handler-id name callback &key after object) signal + do (destructuring-bind (name callback &key after object) signal (signal-connect widget name callback :after after :object (widget-find object toplevels)))) (unset-user-data widget 'signals) (when (typep widget 'container) diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp index 07a6468..9155813 100644 --- a/gtk/gtkwidget.lisp +++ b/gtk/gtkwidget.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: gtkwidget.lisp,v 1.24 2006-09-05 13:37:07 espen Exp $ +;; $Id: gtkwidget.lisp,v 1.25 2006-09-27 08:44:44 espen Exp $ (in-package "GTK") @@ -340,11 +340,11 @@ (defun widget-find (name &optional (root (nreverse (window-list-toplevels))) (er for widget in (mklist root) do (cond ((and (slot-boundp widget 'name) (string= name (widget-name widget))) - (return widget)) + (return-from widget-find widget)) ((typep widget 'container) (let ((descendant (widget-find name (container-children widget) nil))) (when descendant - (return descendant)))))) + (return-from widget-find descendant)))))) (when error-p (error "Widget not found: ~A" name))) -- [mdw]