chiark
/
gitweb
/
~mdw
/
clg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0aef7aa
)
Added args to INVOKE-SOURCE-CALLBACK
author
espen
<espen>
Mon, 25 Jun 2007 13:49:05 +0000
(13:49 +0000)
committer
espen
<espen>
Mon, 25 Jun 2007 13:49:05 +0000
(13:49 +0000)
glib/gcallback.lisp
patch
|
blob
|
blame
|
history
diff --git
a/glib/gcallback.lisp
b/glib/gcallback.lisp
index 0f7baf24a74d855f8f6d2db8eca9ddacb0eb0e43..9e2c8fcd6421a7b87f8af005696adf0c155373a8 100644
(file)
--- 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.
;; 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.4
4 2007-06-20 10:21:54
espen Exp $
+;; $Id: gcallback.lisp,v 1.4
5 2007-06-25 13:49:05
espen Exp $
(in-package "GLIB")
(in-package "GLIB")
@@
-121,14
+121,14
@@
(defbinding source-remove () boolean
(define-callback source-callback-marshal boolean ((callback-id unsigned-int))
(invoke-source-callback callback-id))
(define-callback source-callback-marshal boolean ((callback-id unsigned-int))
(invoke-source-callback callback-id))
-(defun invoke-source-callback (callback-id)
- (restart-case (
funcall (find-user-data callback-id)
)
+(defun invoke-source-callback (callback-id
&rest args
)
+ (restart-case (
apply (find-user-data callback-id) args
)
(remove () :report "Exit and remove source callback"
nil)
(continue () :report "Return from source callback"
t)
(re-invoke nil :report "Re-invoke source callback"
(remove () :report "Exit and remove source callback"
nil)
(continue () :report "Return from source callback"
t)
(re-invoke nil :report "Re-invoke source callback"
- (
invoke-source-callback callback-id
))))
+ (
apply #'invoke-source-callback callback-id args
))))
(defbinding (timeout-add "g_timeout_add_full")
(defbinding (timeout-add "g_timeout_add_full")