projects
/
cl-gtk2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8db8a80
)
in slot-boundp-using-class, check that pointer slot is bound before checking its...
author
Dmitry Kalyanov
<Kalyanov.Dmitry@gmail.com>
Sun, 4 Oct 2009 11:44:04 +0000
(15:44 +0400)
committer
Dmitry Kalyanov
<Kalyanov.Dmitry@gmail.com>
Sun, 4 Oct 2009 11:44:04 +0000
(15:44 +0400)
glib/gobject.meta.lisp
patch
|
blob
|
history
diff --git
a/glib/gobject.meta.lisp
b/glib/gobject.meta.lisp
index
55a48ab
..
f987ad0
100755
(executable)
--- a/
glib/gobject.meta.lisp
+++ b/
glib/gobject.meta.lisp
@@
-231,7
+231,8
@@
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
(handler-case
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
(handler-case
- (and (pointer object)
+ (and (slot-boundp object 'pointer)
+ (pointer object)
(progn (g-object-property-type (pointer object) (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t))
(property-unreadable-error () nil)))
(progn (g-object-property-type (pointer object) (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t))
(property-unreadable-error () nil)))
@@
-248,7
+249,8
@@
new-value)
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
new-value)
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
- (and (pointer object)
+ (and (slot-boundp object 'pointer)
+ (pointer object)
(not (null (gobject-fn-effective-slot-definition-g-getter-fn slot)))))
(defmethod slot-value-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
(not (null (gobject-fn-effective-slot-definition-g-getter-fn slot)))))
(defmethod slot-value-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
@@
-260,7
+262,7
@@
new-value)
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-effective-slot-definition))
new-value)
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-effective-slot-definition))
- t)
+ (slot-boundp object 'pointer))
(defmethod slot-makunbound-using-class ((class gobject-class) object (slot gobject-effective-slot-definition))
nil)
(defmethod slot-makunbound-using-class ((class gobject-class) object (slot gobject-effective-slot-definition))
nil)