From: espen <espen>
Date: Wed, 27 Sep 2006 08:44:44 +0000 (+0000)
Subject: BUg fix
X-Git-Tag: clg-0-93~235
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/9afb775d6948dea9e0c6125016c94b55dce90d70

BUg fix
---

diff --git a/glade-xml/glade-xml.lisp b/glade-xml/glade-xml.lisp
index 84b545b..cd3fef3 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 06bd1a0..1547716 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)))