From 51bd11e7503f7158be59d31445255a5c92cea248 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 16 Sep 2013 17:09:53 -0700 Subject: [PATCH] gtk: Fix start-gtk to look throughout the system library path. System-library-pathname, with a REQUIRED? parameter value of #F, does not search the library-directory-path. --- src/gtk/main.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gtk/main.scm b/src/gtk/main.scm index dd494175a..457e149f8 100644 --- a/src/gtk/main.scm +++ b/src/gtk/main.scm @@ -45,13 +45,12 @@ USA. (list->vector val))))))))) (define (start-gtk name args) - (if (let ((path (system-library-pathname "gtk-shim.so" #f))) - (and path (file-loadable? path))) - (if (let ((s (get-environment-variable "DISPLAY"))) - (and (string? s) (not (string-null? s)))) - (start-gtk* name args) - (warn "DISPLAY not set")) - (error "Gtk shim not loadable."))) + (let ((path (system-library-pathname "gtk-shim.so"))) + (if (not (file-loadable? path)) (error "Gtk shim not loadable.")) + (if (let ((s (get-environment-variable "DISPLAY"))) + (and (string? s) (not (string-null? s)))) + (start-gtk* name args) + (warn "DISPLAY not set")))) (define (start-gtk* name args) ;; Call start_gtk. Signals an error if gtk_init_check returns 0. -- 2.25.1