Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto
Dir : e17/proto/python-efl/python-ecore/ecore/evas
Modified Files:
ecore.evas.c_ecore_evas_base.pxi
Log Message:
Check NULL pointer from char* returns
===================================================================
RCS file:
/cvs/e/e17/proto/python-efl/python-ecore/ecore/evas/ecore.evas.c_ecore_evas_base.pxi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore.evas.c_ecore_evas_base.pxi 3 May 2007 16:13:19 -0000 1.1
+++ ecore.evas.c_ecore_evas_base.pxi 6 May 2007 17:39:48 -0000 1.2
@@ -127,10 +127,19 @@
cdef char *filename
cdef int layer, hotx, hoty
ecore_evas_cursor_get(self.obj, &filename, &layer, &hotx, &hoty)
- return (filename, layer, hotx, hoty)
+ if filename == NULL:
+ fn = None
+ else:
+ fn = filename
+ return (fn, layer, hotx, hoty)
- def cursor_set(self, char *filename, int layer=0, int hotx=0, int hoty=0):
- ecore_evas_cursor_set(self.obj, filename, layer, hotx, hoty)
+ def cursor_set(self, filename, int layer=0, int hotx=0, int hoty=0):
+ cdef char *f
+ if filename is None:
+ f = NULL
+ else:
+ f = filename
+ ecore_evas_cursor_set(self.obj, f, layer, hotx, hoty)
def move(self, int x, int y):
ecore_evas_move(self.obj, x, y)
@@ -288,7 +297,10 @@
ecore_evas_title_set(self.obj, t)
def title_get(self):
- return ecore_evas_title_get(self.obj)
+ cdef char *s
+ s = ecore_evas_title_get(self.obj)
+ if s != NULL:
+ return s
property title:
def __get__(self):
@@ -303,7 +315,15 @@
def name_class_get(self):
cdef char *n, *c
ecore_evas_name_class_get(self.obj, &n, &c)
- return (n, c)
+ if n == NULL:
+ name = None
+ else:
+ name = n
+ if c == NULL:
+ cls = None
+ else:
+ cls = c
+ return (name, cls)
property name_class:
def __get__(self):
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
