Bug fix

[clg] / glib / defpackage.lisp

diff --git a/glib/defpackage.lisp b/glib/defpackage.lisp
index 52c0cbfe027fb9bbde8a1b0dba5a7cc1b79a10bc..7f79d4c37df42cc9edd325d61681e7102790443d 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.
 
 ;; 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.16 2006/09/05 13:18:58 espen Exp $
+;; $Id: defpackage.lisp,v 1.23 2007/06/25 13:48:10 espen Exp $

 
 
 (defpackage "GLIB"
   (:use "COMMON-LISP" "GFFI" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
   #+cmu(:use "PCL" "EXT")
   #+sbcl(:use "SB-MOP" "SB-EXT")
 
 
 (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")
   #+clisp(:use "CLOS")
   #+clisp(:import-from "EXT" "RUN-PROGRAM")
   #+clisp(:shadowing-import-from "GFFI" "SLOT-DEFINITION-TYPE")


@@ -47,9 +48,9 @@ (defpackage "GLIB"
           "TYPE-FROM-GLIB-NAME")
   ;; Symbols from gparam.lisp  
   (:export "GVALUE" "GVALUE-INIT" "GVALUE-NEW" "GVALUE-FREE" "GVALUE-TYPE" 
           "TYPE-FROM-GLIB-NAME")
   ;; Symbols from gparam.lisp  
   (:export "GVALUE" "GVALUE-INIT" "GVALUE-NEW" "GVALUE-FREE" "GVALUE-TYPE" 

-          "GVALUE-GET" "GVALUE-SET" "VALUE-P" "WITH-GVALUE" "+GVALUE-SIZE+"
-          "+GVALUE-VALUE-OFFSET+" "PARAM-FLAG-TYPE" "PARAM" "PARAM-CHAR"
-          "PARAM-UNSIGNED-CHAR" "PARAM-BOOLEAN" "PARAM-INT" 
+          "GVALUE-GET" "GVALUE-SET" "GVALUE-UNSET" "VALUE-P" "WITH-GVALUE" 
+          "+GVALUE-SIZE+" "+GVALUE-VALUE-OFFSET+" "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"
           "PARAM-DOUBLE-FLOAT" "PARAM-STRING" "PARAM-PARAM" "PARAM-BOXED"
           "PARAM-UNSIGNED-INT" "PARAM-LONG" "PARAM-UNSIGNED-LONG"
           "PARAM-UNICHAR" "PARAM-ENUM" "PARAM-FLAGS" "PARAM-SINGLE-FLOAT"
           "PARAM-DOUBLE-FLOAT" "PARAM-STRING" "PARAM-PARAM" "PARAM-BOXED"


@@ -64,17 +65,17 @@ (defpackage "GLIB"
   ;; Symbols from gcallback.lisp  
   (:export "GCLOSURE" "REGISTER-CALLBACK-FUNCTION" "INVOKE-CALLBACK" 
           "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE"
   ;; 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+"

           "ENSURE-SIGNAL-ID" "SIGNAL-LIST-NAMES" "SIGNAL-LOOKUP" 
           "SIGNAL-LIST-IDS" "DESCRIBE-SIGNAL" "DEFINE-SIGNAL-HANDLER"
           "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" 
           "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" 

-          "make-callback-closure"

           "COMPUTE-SIGNAL-FUNCTION" "SIGNAL-CONNECT" "COMPUTE-SIGNAL-ID"
           "SIGNAL-EMIT-WITH-DETAIL" "SIGNAL-EMIT" "DEFINE-CALLBACK-MARSHAL"
           "COMPUTE-SIGNAL-FUNCTION" "SIGNAL-CONNECT" "COMPUTE-SIGNAL-ID"
           "SIGNAL-EMIT-WITH-DETAIL" "SIGNAL-EMIT" "DEFINE-CALLBACK-MARSHAL"

-          "WITH-CALLBACK-FUNCTION")
+          "WITH-CALLBACK-FUNCTION" "SIGNAL-NEW" "*SIGNAL-STOP-EMISSION*")

   ;; Symbols from gobject.lisp  
   (:export "GOBJECT-CLASS" "INSTANCE-SLOTS-P" "DIRECT-PROPERTY-SLOT-DEFINITION"
           "SLOT-DEFINITION-PNAME" "CONSTRUCT-ONLY-PROPERTY-P" 
   ;; Symbols from gobject.lisp  
   (:export "GOBJECT-CLASS" "INSTANCE-SLOTS-P" "DIRECT-PROPERTY-SLOT-DEFINITION"
           "SLOT-DEFINITION-PNAME" "CONSTRUCT-ONLY-PROPERTY-P" 


@@ -86,7 +87,7 @@ (defpackage "GLIB"
           "EXPAND-GOBJECT-TYPE" "GOBJECT-DEPENDENCIES" "SIGNAL-NAME-TO-STRING"
           "REFERENCED")
   ;; Symbols from ginterface.lisp  
           "EXPAND-GOBJECT-TYPE" "GOBJECT-DEPENDENCIES" "SIGNAL-NAME-TO-STRING"
           "REFERENCED")
   ;; Symbols from ginterface.lisp  

-  (:export "GINTERFACE" "GINTERFACE-CLASS" "QUERY-OBJECT-INTERFACE-PROPERTIES")
+  (: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" 
   ;; Symbols from gerror.lisp  
   (:export "GERROR" "GERROR-DOMAIN" "GERROR-CODE" "GERROR-MESSAGE" 
           "GLIB-ERROR" "GLIB-FILE-ERROR" "SIGNAL-GERROR"