From: Dmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Date: Wed, 13 May 2009 11:05:58 +0000 (+0400)
Subject: Add condition type for access to unreadable properties; return NIL on access to unrea... 
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=81e0009ee540f42c64ab1670a4fe936681fbdb6c;p=cl-gtk2.git

Add condition type for access to unreadable properties; return NIL on access to unreadable property (for Slime
Inspector to work)
---

diff --git a/glib/gobject.foreign-gobject.lisp b/glib/gobject.foreign-gobject.lisp
index 33b8434..c736aff 100644
--- a/glib/gobject.foreign-gobject.lisp
+++ b/glib/gobject.foreign-gobject.lisp
@@ -200,6 +200,24 @@
       (etypecase object
         (g-object (pointer object)))))
 
+(define-condition property-access-error (error)
+  ((property-name :initarg :property-name :reader property-access-error-property-name)
+   (class-name :initarg :class-name :reader property-access-error-class-name)
+   (message :initarg :message :reader property-access-error-message))
+  (:report (lambda (condition stream)
+             (format stream "Error accessing property '~A' on class '~A': ~A"
+                     (property-access-error-property-name condition)
+                     (property-access-error-class-name condition)
+                     (property-access-error-message condition)))))
+
+(define-condition property-unreadable-error (property-access-error)
+  ()
+  (:default-initargs :message "property is not readable"))
+
+(define-condition property-unwritable-error (property-access-error)
+  ()
+  (:default-initargs :message "property is not writable"))
+
 (defun g-param-spec-property-type (param-spec property-name object-type assert-readable assert-writable)
   (when (null-pointer-p param-spec)
            (error "Property ~A on type ~A is not found"
@@ -210,17 +228,17 @@
                           (foreign-slot-value param-spec
                                               'g-param-spec
                                               'flags))))
-    (error "Property ~A on type ~A is not readable"
-           property-name
-           (g-type-name object-type)))
+    (error 'property-unreadable-error
+           :property-name property-name
+           :class-name (g-type-name object-type)))
   (when (and assert-writable
              (not (member :writable
                           (foreign-slot-value param-spec
                                               'g-param-spec
                                               'flags))))
-    (error "Property ~A on type ~A is not writable"
-           property-name
-           (g-type-name object-type)))
+    (error 'property-unwritable-error
+           :property-name property-name
+           :class-name (g-type-name object-type)))
   (foreign-slot-value param-spec 'g-param-spec 'value-type))
 
 (defun g-object-type-property-type (object-type property-name
@@ -271,9 +289,11 @@
                (foreign-slot-pointer parameter 'g-parameter 'value)))))))
 
 (defun g-object-call-get-property (object property-name &optional property-type)
-  (unless property-type
-    (setf property-type
-          (g-object-property-type object property-name :assert-readable t)))
+  (restart-case
+      (unless property-type
+        (setf property-type
+              (g-object-property-type object property-name :assert-readable t)))
+    (return-nil () (return-from g-object-call-get-property nil)))
   (setf property-type (ensure-g-type property-type))
   (with-foreign-object (value 'g-value)
     (g-value-zero value)
diff --git a/glib/gobject.meta.lisp b/glib/gobject.meta.lisp
index c448d37..ab05e3f 100644
--- a/glib/gobject.meta.lisp
+++ b/glib/gobject.meta.lisp
@@ -180,9 +180,13 @@
         (call-next-method class :pointer pointer))))
 
 (defmethod slot-value-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
-  (g-object-call-get-property object
-                              (gobject-property-effective-slot-definition-g-property-name slot)
-                              (gobject-effective-slot-definition-g-property-type slot)))
+  (handler-bind
+      ((property-unreadable-error (lambda (condition)
+                                    (declare (ignore condition))
+                                    (invoke-restart 'return-nil))))
+    (g-object-call-get-property object
+                                (gobject-property-effective-slot-definition-g-property-name slot)
+                                (gobject-effective-slot-definition-g-property-type slot))))
 
 (defmethod (setf slot-value-using-class) (new-value (class gobject-class) object (slot gobject-property-effective-slot-definition))
   (g-object-call-set-property object
@@ -191,7 +195,9 @@
                               (gobject-effective-slot-definition-g-property-type slot)))
 
 (defmethod slot-value-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
-  (funcall (gobject-fn-effective-slot-definition-g-getter-fn slot) object))
+  (let ((fn (gobject-fn-effective-slot-definition-g-getter-fn slot)))
+    (when fn
+      (funcall fn object))))
 
 (defmethod (setf slot-value-using-class) (new-value (class gobject-class) object (slot gobject-fn-effective-slot-definition))
   (funcall (gobject-fn-effective-slot-definition-g-setter-fn slot) object new-value))