From cc7092e40b16bf9f938dded9c50fe9711119f076 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Wed, 3 Nov 2004 16:54:23 +0000 Subject: [PATCH] Remove automatic system initialization Organization: Straylight/Edgeware From: espen --- gtk/gtk.asd | 6 ++---- gtk/gtkobject.lisp | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gtk/gtk.asd b/gtk/gtk.asd index db9ae6c..34752c6 100644 --- a/gtk/gtk.asd +++ b/gtk/gtk.asd @@ -3,8 +3,7 @@ (asdf:oos 'asdf:load-op :clg-tools) (defpackage "GTK-SYSTEM" - (:use "COMMON-LISP" "ASDF" "PKG-CONFIG") - (:export "CLG-INIT")) + (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")) (in-package "GTK-SYSTEM") @@ -27,5 +26,4 @@ (:file "gtkcontainer" :depends-on ("gtktypes")) (:file "gtk" :depends-on ("gtktypes")) (:file "gtkutils" :depends-on ("gtk")) - (:file "export" :depends-on ("gtktypes" "gtk"))) - :perform (load-op :after (op gtk) (clg-init))) + (:file "export" :depends-on ("gtktypes" "gtk")))) diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index e266909..0173ba6 100644 --- a/gtk/gtkobject.lisp +++ b/gtk/gtkobject.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gtkobject.lisp,v 1.17 2004-10-31 14:44:05 espen Exp $ +;; $Id: gtkobject.lisp,v 1.18 2004-11-03 16:54:24 espen Exp $ (in-package "GTK") @@ -92,8 +92,6 @@ (defbinding (gtk-init "gtk_parse_args") () nil (nil null) (nil null)) -(import 'gtk-system:clg-init) - (defun clg-init (&optional display) "Initializes the system and starts the event handling" (unless (gdk:display-get-default) -- [mdw]