From 7bc096ce304032fb2588826ac76f9e2caf36bf44 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Fri, 11 Dec 2015 11:49:48 -0700 Subject: [PATCH] gtk: No need to frob subprocess-wait anymore. Hook/subprocess-wait is gone. The default subprocess-wait is now nonblocking/subprocess-wait. --- src/glib/glib-main.scm | 1 - src/glib/glib.pkg | 2 -- src/gtk/gtk.pkg | 2 -- src/gtk/main.scm | 1 - 4 files changed, 6 deletions(-) diff --git a/src/glib/glib-main.scm b/src/glib/glib-main.scm index a5c90dd6d..0f68cd5f9 100644 --- a/src/glib/glib-main.scm +++ b/src/glib/glib-main.scm @@ -28,7 +28,6 @@ USA. (define (glib-start) ;; Called from glib/make.scm, from a (load-option 'Glib). - (set! hook/subprocess-wait nonblocking/subprocess-wait) (let ((path (system-library-pathname "glib-shim.so"))) (if (not (file-loadable? path)) (error "Glib shim not loadable."))) (if (fix:zero? (C-call "start_glib")) diff --git a/src/glib/glib.pkg b/src/glib/glib.pkg index 540450ae2..f70bcea5b 100644 --- a/src/glib/glib.pkg +++ b/src/glib/glib.pkg @@ -98,8 +98,6 @@ USA. default/process-command-line) (import (runtime) ucode-primitive) - (import (runtime subprocess) - hook/subprocess-wait nonblocking/subprocess-wait) (import (glib thread) create-glib-thread exit-glib-thread) (export () diff --git a/src/gtk/gtk.pkg b/src/gtk/gtk.pkg index d1f13bf4f..fb85a3d37 100644 --- a/src/gtk/gtk.pkg +++ b/src/gtk/gtk.pkg @@ -262,8 +262,6 @@ USA. default/process-command-line) (import (runtime) ucode-primitive) - (import (runtime subprocess) - hook/subprocess-wait nonblocking/subprocess-wait) (import (gtk gtk-widget) toplevel-windows) (export () diff --git a/src/gtk/main.scm b/src/gtk/main.scm index 59ca873b7..d9eebe10e 100644 --- a/src/gtk/main.scm +++ b/src/gtk/main.scm @@ -31,7 +31,6 @@ USA. (define (gtk-start) ;; Called from gtk/make.scm, from a (load-option 'Gtk). - (set! hook/subprocess-wait nonblocking/subprocess-wait) (init-gtk ((ucode-primitive scheme-program-name 0)) *unused-command-line*)) (define (initialize-package!) -- 2.25.1