Hopefully allow (require :glib) again.

[clg] / glib / defpackage.lisp

diff --git a/glib/defpackage.lisp b/glib/defpackage.lisp
index 0ea858b530f335d0f0799a74f0226ddb5a9ffe06..1679b4585ca1749d1675790d3a3024d50e5b659a 100644 (file)
--- a/glib/defpackage.lisp
+++ b/glib/defpackage.lisp
@@ -20,13 +20,14 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: defpackage.lisp,v 1.20 2007-02-19 13:07:46 espen Exp $
+;; $Id: defpackage.lisp,v 1.29 2008-12-10 02:42:47 espen Exp $
 
 
 (defpackage "GLIB"
   (:use "COMMON-LISP" "GFFI" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
   #+cmu(:use "PCL" "EXT")
   #+sbcl(:use "SB-MOP" "SB-EXT")
+  #+sb-thread(:use "SB-THREAD")
   #+clisp(:use "CLOS")
   #+clisp(:import-from "EXT" "RUN-PROGRAM")
   #+clisp(:shadowing-import-from "GFFI" "SLOT-DEFINITION-TYPE")
@@ -34,8 +35,10 @@ (defpackage "GLIB"
 
   ;; Symbols from glib.lisp  
   (:export "REGISTER-USER-DATA" "FIND-USER-DATA" "USER-DATA-EXISTS-P"
-          "UPDATE-USER-DATA" "DESTROY-USER-DATA" "QUARK" "QUARK-INTERN"
-          "QUARK-TO-STRING" "GLIST" "GSLIST")
+          "UPDATE-USER-DATA" "DESTROY-USER-DATA" "TAKE-USER-DATA"
+          "WITH-USER-DATA" "USER-DATA-ID" "QUARK" "QUARK-INTERN" 
+          "QUARK-TO-STRING" "GLIST" "GSLIST" "REALLOCATE-MEMORY" 
+          "USER-CALLBACK" "GSIZE" "GSSIZE" "GOFFSET" "SLICE-ALLOC")
   ;; Symbols from gtype.lisp  
   (:export "TYPE-NUMBER" "GTYPE" "TYPE-QUERY" "TYPE-INSTANCE-SIZE"
           "TYPE-CLASS-SIZE" "TYPE-CLASS-REF" "TYPE-CLASS-UNREF"
@@ -44,11 +47,12 @@ (defpackage "GLIB"
           "FIND-TYPE-NUMBER" "TYPE-FROM-NUMBER" "SUPERTYPE"
           "GINSTANCE-CLASS" "GINSTANCE" "REGISTER-DERIVABLE-TYPE"
           "INIT-TYPES-IN-LIBRARY" "DEFINE-TYPES-BY-INTROSPECTION"
-          "TYPE-FROM-GLIB-NAME")
+          "DEFINE-TYPES-IN-LIBRARY" "TYPE-FROM-GLIB-NAME")
   ;; Symbols from gparam.lisp  
   (:export "GVALUE" "GVALUE-INIT" "GVALUE-NEW" "GVALUE-FREE" "GVALUE-TYPE" 
           "GVALUE-GET" "GVALUE-SET" "GVALUE-UNSET" "VALUE-P" "WITH-GVALUE" 
-          "+GVALUE-SIZE+" "+GVALUE-VALUE-OFFSET+" "PARAM-FLAG-TYPE" "PARAM" 
+          "+GVALUE-SIZE+" "+GVALUE-VALUE-OFFSET+" "GVALUE-STATIC-P"
+          "PARAM-FLAG-TYPE" "PARAM"
           "PARAM-CHAR" "PARAM-UNSIGNED-CHAR" "PARAM-BOOLEAN" "PARAM-INT" 
           "PARAM-UNSIGNED-INT" "PARAM-LONG" "PARAM-UNSIGNED-LONG"
           "PARAM-UNICHAR" "PARAM-ENUM" "PARAM-FLAGS" "PARAM-SINGLE-FLOAT"
@@ -64,16 +68,19 @@ (defpackage "GLIB"
   ;; Symbols from gcallback.lisp  
   (:export "GCLOSURE" "REGISTER-CALLBACK-FUNCTION" "INVOKE-CALLBACK" 
           "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE"
+          "SOURCE-REMOVE" "+PRIORITY-DEFAULT-IDLE+" "+PRIORITY-DEFAULT+"
+          "+PRIORITY-HIGH+" "+PRIORITY-HIGH-IDLE+" "+PRIORITY-LOW+"
           "ENSURE-SIGNAL-ID" "SIGNAL-LIST-NAMES" "SIGNAL-LOOKUP" 
           "SIGNAL-LIST-IDS" "DESCRIBE-SIGNAL" "DEFINE-SIGNAL-HANDLER"
-          "CALL-NEXT-HANDLER" "MAKE-CALLBACK-CLOSURE"
+          "CALL-NEXT-HANDLER" "MAKE-CALLBACK-CLOSURE" "INVOKE-SOURCE-CALLBACK"
           "SIGNAL-STOP-EMISSION" "SIGNAL-ADD-EMISSION-HOOK"
           "SIGNAL-REMOVE-EMISSION-HOOK" "SIGNAL-HAS-HANDLER-PENDING-P"
           "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK" 
           "SIGNAL-HANDLER-DISCONNECT" "SIGNAL-HANDLER-IS-CONNECTED-P" 
           "COMPUTE-SIGNAL-FUNCTION" "SIGNAL-CONNECT" "COMPUTE-SIGNAL-ID"
           "SIGNAL-EMIT-WITH-DETAIL" "SIGNAL-EMIT" "DEFINE-CALLBACK-MARSHAL"
-          "WITH-CALLBACK-FUNCTION" "SIGNAL-NEW" "*SIGNAL-STOP-EMISSION*")
+          "WITH-CALLBACK-FUNCTION" "SIGNAL-NEW" "*SIGNAL-STOP-EMISSION*"
+          "CONNECT-FLAGS")
   ;; Symbols from gobject.lisp  
   (:export "GOBJECT-CLASS" "INSTANCE-SLOTS-P" "DIRECT-PROPERTY-SLOT-DEFINITION"
           "SLOT-DEFINITION-PNAME" "CONSTRUCT-ONLY-PROPERTY-P" 
@@ -83,15 +90,21 @@ (defpackage "GLIB"
           "USER-DATA-DESTROY-CALLBACK" "USER-DATA-P" "UNSET-USER-DATA"
           "QUERY-OBJECT-CLASS-PROPERTIES" "SLOT-DEFINITIONS" 
           "EXPAND-GOBJECT-TYPE" "GOBJECT-DEPENDENCIES" "SIGNAL-NAME-TO-STRING"
-          "REFERENCED")
+          "REFERENCED" "INITIALLY-UNOWNED")
   ;; Symbols from ginterface.lisp  
   (:export "INTERFACE" "INTERFACE-CLASS" "QUERY-OBJECT-INTERFACE-PROPERTIES")
   ;; Symbols from gerror.lisp  
   (:export "GERROR" "GERROR-DOMAIN" "GERROR-CODE" "GERROR-MESSAGE" 
-          "GLIB-ERROR" "GLIB-FILE-ERROR" "SIGNAL-GERROR" 
+          "GLIB-ERROR" "GLIB-FILE-ERROR" "SIGNAL-GERROR" "FILE-ERROR-DOMAIN"
           "GERROR-SIGNAL" "LOG-LEVELS" "LOG-DOMAIN" "LOG-MESSAGE" 
           "UNKNOWN-LOG-LEVEL" "ERROR-LOG-LEVEL" "CRITICAL-LOG-LEVEL" 
-          "WARNING-LOG-LEVEL" "INFO-LOG-LEVEL" "DEBUG-LOG-LEVEL")
+          "WARNING-LOG-LEVEL" "INFO-LOG-LEVEL" "DEBUG-LOG-LEVEL"
+          "FILE-ERROR-ENUM" "GERROR-NEW" "GERROR-SET" "GERROR-SET-IN-CALLBACK")
   ;; Symbols from genum.lisp  
-  (:export "QUERY-ENUM-VALUES"))
+  (:export "QUERY-ENUM-VALUES")
+  ;; Symbols from main-loop.lisp  
+  (:export "MAIN-LOOP" "MAIN-LOOP-RUN" "MAIN-LOOP-QUIT" "WITH-MAIN-LOOP"
+          "MAIN-LOOP-CONTEXT" "MAIN-LOOP-IS-RUNNING-P")
+  )
+