Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas.c_evas_canvas.pxi evas.c_evas_object.pxi
Log Message:
Python-Evas minor adjustments.
* Now that pxd usage was improved, use _unset_obj() as cdef.
* obj_free_cb() unsets self.obj and self.evas before using callback.
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_canvas.pxi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas.c_evas_canvas.pxi 19 Oct 2007 13:16:32 -0000 1.15
+++ evas.c_evas_canvas.pxi 13 Nov 2007 21:55:32 -0000 1.16
@@ -65,12 +65,10 @@
Canvas_remember(<long>self.obj, self)
return 1
- # XXX: this should be C-only, but it would require ecore_evas
- # XXX: being able to use it.
- def _unset_obj(self):
- "Remove internally wrapped Evas*."
+ cdef int _unset_obj(self) except 0:
Canvas_forget(<long>self.obj)
self.obj = NULL
+ return 1
def _new_evas(self):
"""Creates an internal (wrapped) 'Evas*' for this object.
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evas.c_evas_object.pxi 5 Nov 2007 21:47:48 -0000 1.22
+++ evas.c_evas_object.pxi 13 Nov 2007 21:55:33 -0000 1.23
@@ -29,6 +29,9 @@
cdef Object self
self = <Object>data
+ self.obj = NULL
+ self.evas = <Canvas>None
+
lst = self._callbacks[EVAS_CALLBACK_FREE]
if lst is not None:
for func, args, kargs in lst:
@@ -37,7 +40,8 @@
except Exception, e:
traceback.print_exc()
- self._unset_obj()
+ _free_wrapper_resources(self)
+ python.Py_DECREF(self)
cdef _register_decorated_callbacks(obj):
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
