[gtk-cffi-cvs] CVS gtk-cffi/g-object

[CVS User rklochkov]

Update of /project/gtk-cffi/cvsroot/gtk-cffi/g-object
In directory tiger.common-lisp.net:/tmp/cvs-serv6738/g-object

Modified Files:
	g-value.lisp loadlib.lisp 
Log Message:
1


--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-value.lisp	2012/12/31 13:33:38	1.9
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-value.lisp	2013/03/23 13:14:23	1.10
@@ -69,8 +69,9 @@
 (defun init-g-value (ptr type value value-p)
   (macrolet ((gtypecase (x &rest body)
                `(typecase ,x
-                  ,@(mapcar (lambda (x) (list (car x)
-                                              (keyword->g-type (cdr x))))
+                  ,@(mapcar (lambda (x) 
+                              (list (car x)
+                                    (keyword->g-type (cdr x))))
                             body))))
     (let ((%type (or type
                      (when value-p
@@ -146,8 +147,10 @@
                    ((#.(keyword->g-type :enum)
                        #.(keyword->g-type :flags))
                     (convert-to-foreign value (g-type->lisp type)))
-                   (#.(keyword->g-type :double) (coerce value 'double-float))
-                   (#.(keyword->g-type :float) (coerce value 'single-float))
+                   (#.(keyword->g-type :double)
+                      (coerce value 'double-float))
+                   (#.(keyword->g-type :float)
+                      (coerce value 'single-float))
                    ((#.(keyword->g-type :int)
                        #.(keyword->g-type :uint)
                        #.(keyword->g-type :long)
@@ -157,7 +160,8 @@
                    (t value))))
 ;        (debug-out "  converted value ~a~%" val) 
         (when (/= type 0)
-          (funcall (select-accessor ftype :g-value-set-) ptr val)))))
+          (funcall (select-accessor ftype :g-value-set-) 
+                   ptr val)))))
 
   (defun g-value-get (value)
     (unless (null-pointer-p value)
@@ -201,7 +205,8 @@
   "This macro allows recursive *g-value* binding"
   `(progn
      (let* ((changed? (/= 0 (g-type *g-value*)))
-            (*g-value* (if changed? (make-instance 'g-value) *g-value*)))
+            (*g-value* (if changed? (make-instance 'g-value) 
+                           *g-value*)))
        (init *g-value* , at val)
        (unwind-protect
             (progn
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/loadlib.lisp	2012/02/12 17:29:41	1.3
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/loadlib.lisp	2013/03/23 13:14:23	1.4
@@ -9,7 +9,7 @@
 (in-package #:g-object-cffi)
 
 (define-foreign-library :g-object
-  (:unix "libgobject-2.0.so")
+  (:unix (:or "libgobject-2.0.so.0" "libgobject-2.0.so"))
   (:windows "libgobject-2.0-0.dll"))
 
 (use-foreign-library :g-object)
\ No newline at end of file