From: espen <espen>
Date: Thu, 10 May 2007 20:25:09 +0000 (+0000)
Subject: Second arg to make-callback-closure made optional
X-Git-Tag: clg-0-93~162
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/99d59d2abd30e21e5b690a758c8e6998c57ac2c0

Second arg to make-callback-closure made optional
---

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index 92cc02d..686dc8b 100644
--- a/glib/gcallback.lisp
+++ b/glib/gcallback.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: gcallback.lisp,v 1.41 2007/04/06 14:31:43 espen Exp $
+;; $Id: gcallback.lisp,v 1.42 2007/05/10 20:25:09 espen Exp $
 
 (in-package "GLIB")
 
@@ -352,7 +352,7 @@ (defbinding signal-handler-find () unsigned-long
   (detail quark)
   (closure (or null pointer))
   (func (or null pointer))
-  (data unsigned-long))
+  (data pointer-data))
 
 (defbinding signal-handler-disconnect () nil
   (instance ginstance)
@@ -377,7 +377,7 @@ (defun callback-closure-new (callback-id callback destroy-notify)
     (closure-set-meta-marshal gclosure callback-id callback)
     gclosure))
 
-(defun make-callback-closure (function marshaller)
+(defun make-callback-closure (function &optional (marshaller signal-handler-marshal))
   (let ((callback-id (register-callback-function function)))
     (values
      (callback-closure-new callback-id marshaller user-data-destroy-callback)