summaryrefslogtreecommitdiff
path: root/efl/ecore
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2013-03-23 06:50:33 +0000
committerKai Huuhko <kai.huuhko@gmail.com>2013-03-23 06:50:33 +0000
commitf6909ac42c53c4ad3c3bb2d7b4e331d2e4605bbd (patch)
tree8fb90236754e638612ffa59d9a91a7c2dae219b1 /efl/ecore
parentb91fe8b857be90d297d79525b7d794af5131a04c (diff)
Internal function renames:
* _strings_to_python -> eina_list_strings_to_python_list * _strings_from_python -> python_list_strings_to_eina_list Add two functions for string array conversion. Add two properties to elm.Window.
Diffstat (limited to 'efl/ecore')
-rw-r--r--efl/ecore/efl.ecore_exe.pxi4
-rw-r--r--efl/ecore/efl.ecore_file_download.pxi8
2 files changed, 6 insertions, 6 deletions
diff --git a/efl/ecore/efl.ecore_exe.pxi b/efl/ecore/efl.ecore_exe.pxi
index 60447e5..54e9a12 100644
--- a/efl/ecore/efl.ecore_exe.pxi
+++ b/efl/ecore/efl.ecore_exe.pxi
@@ -460,7 +460,7 @@ cdef class Exe(object):
460 :rtype: str or None 460 :rtype: str or None
461 461
462 """ 462 """
463 cdef const_char_ptr cmd = ecore_exe_cmd_get(self.exe) 463 cdef const_char *cmd = ecore_exe_cmd_get(self.exe)
464 if cmd != NULL: 464 if cmd != NULL:
465 return cmd 465 return cmd
466 return None 466 return None
@@ -511,7 +511,7 @@ cdef class Exe(object):
511 :rtype: str or None 511 :rtype: str or None
512 512
513 """ 513 """
514 cdef const_char_ptr tag = ecore_exe_tag_get(self.exe) 514 cdef const_char *tag = ecore_exe_tag_get(self.exe)
515 if tag != NULL: 515 if tag != NULL:
516 return tag 516 return tag
517 return None 517 return None
diff --git a/efl/ecore/efl.ecore_file_download.pxi b/efl/ecore/efl.ecore_file_download.pxi
index 3fd7d6a..5e1f78d 100644
--- a/efl/ecore/efl.ecore_file_download.pxi
+++ b/efl/ecore/efl.ecore_file_download.pxi
@@ -16,14 +16,14 @@
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18
19cdef void _completion_cb(void *data, const_char_ptr file, int status) with gil: 19cdef void _completion_cb(void *data, const_char *file, int status) with gil:
20 obj = <FileDownload>data 20 obj = <FileDownload>data
21 try: 21 try:
22 obj._exec_completion(file, status) 22 obj._exec_completion(file, status)
23 except Exception, e: 23 except Exception, e:
24 traceback.print_exc() 24 traceback.print_exc()
25 25
26cdef int _progress_cb(void *data, const_char_ptr file, long int dltotal, 26cdef int _progress_cb(void *data, const_char *file, long int dltotal,
27 long int dlnow, long int ultotal, long int ulnow) with gil: 27 long int dlnow, long int ultotal, long int ulnow) with gil:
28 obj = <FileDownload>data 28 obj = <FileDownload>data
29 try: 29 try:
@@ -117,11 +117,11 @@ cdef class FileDownload(object):
117 self.args = None 117 self.args = None
118 self.kargs = None 118 self.kargs = None
119 119
120 cdef object _exec_completion(self, const_char_ptr file, int status): 120 cdef object _exec_completion(self, const_char *file, int status):
121 if self.completion_cb: 121 if self.completion_cb:
122 self.completion_cb(file, status, *self.args, **self.kargs) 122 self.completion_cb(file, status, *self.args, **self.kargs)
123 123
124 cdef object _exec_progress(self, const_char_ptr file, long int dltotal, 124 cdef object _exec_progress(self, const_char *file, long int dltotal,
125 long int dlnow, long int ultotal, long int ulnow): 125 long int dlnow, long int ultotal, long int ulnow):
126 if self.progress_cb: 126 if self.progress_cb:
127 return self.progress_cb(file, dltotal, dlnow, ultotal, ulnow, 127 return self.progress_cb(file, dltotal, dlnow, ultotal, ulnow,