X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/0db97641fc60ac5a3fb3a927e6b74c2b861fdea7..db7a1e771d6aec41d0489b07c546d99ebbbc1019:/glib/defpackage.lisp

diff --git a/glib/defpackage.lisp b/glib/defpackage.lisp
index 0ea858b..ae0eae1 100644
--- 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.26 2007-10-17 14:30:00 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" "SLICE-ALLOC")
   ;; Symbols from gtype.lisp  
   (:export "TYPE-NUMBER" "GTYPE" "TYPE-QUERY" "TYPE-INSTANCE-SIZE"
 	   "TYPE-CLASS-SIZE" "TYPE-CLASS-REF" "TYPE-CLASS-UNREF"
@@ -64,16 +67,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"