X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/76fe8daf4ee28e8bdbb84b88bcb6e588ae9bd9f9..f7f58f900d15c703dde92bb493e1764ab01ad5f5:/gtk/gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 9b36411..269be02 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.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: gtk.lisp,v 1.65 2006-09-13 10:54:49 espen Exp $
+;; $Id: gtk.lisp,v 1.67 2007-01-07 20:23:22 espen Exp $
 
 
 (in-package "GTK")
@@ -88,7 +88,7 @@
       ;; When running in Slime we need to hook into the Swank server
       ;; to handle events asynchronously
       (if (find-package "SWANK")
-	  (let ((read-from-emacs (find-symbol "READ-FROM-EMACS" "SWANK"))
+	  (let ((read-from-emacs (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK")))
 		(stream (funcall (find-symbol "CONNECTION.SOCKET-IO" "SWANK") (symbol-value (find-symbol "*EMACS-CONNECTION*" "SWANK")))))
 	    (setf (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK"))
 	     #'(lambda ()
@@ -436,11 +436,11 @@
   (container-add bin child)
   child)
 
-(defmethod compute-signal-function ((bin bin) signal function object)
+(defmethod compute-signal-function ((bin bin) signal function object args)
   (declare (ignore signal))
   (if (eq object :child)
-      #'(lambda (&rest args) 
-	  (apply function (bin-child bin) (rest args)))
+      #'(lambda (&rest emission-args) 
+	  (apply function (bin-child bin) (nconc (rest emission-args) args)))
     (call-next-method)))
 
 
@@ -670,8 +670,8 @@
       (ensure-signal-id 'response dialog)
     (call-next-method)))
 
-(defmethod compute-signal-function ((dialog dialog) signal function object)
-  (declare (ignore function object))
+(defmethod compute-signal-function ((dialog dialog) signal function object args)
+  (declare (ignore function object args))
   (let ((callback (call-next-method))
 	(id (dialog-response-id dialog signal)))
     (if id