summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2015-03-24 14:48:05 +0200
committerKai Huuhko <kai.huuhko@gmail.com>2015-03-24 14:48:05 +0200
commit9f4eab83b7f789c2237ac02e9f33352499712314 (patch)
treec1dae88e79b8f06ba929ff3366de1b830cb2eb57
parent61b53f24774de8690c6f1e4a8a6e55e30e514714 (diff)
Elm.Naviframe: Fix item_pop_cb call
-rw-r--r--efl/elementary/naviframe.pyx13
1 files changed, 5 insertions, 8 deletions
diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx
index 4053adf..394dad5 100644
--- a/efl/elementary/naviframe.pyx
+++ b/efl/elementary/naviframe.pyx
@@ -128,7 +128,7 @@ cdef object _cb_object_item_conv(void *addr):
128 128
129cdef Eina_Bool py_elm_naviframe_item_pop_cb(void *data, Elm_Object_Item *it): 129cdef Eina_Bool py_elm_naviframe_item_pop_cb(void *data, Elm_Object_Item *it):
130 cdef: 130 cdef:
131 ObjectItem item = _object_item_to_python(it) 131 NaviframeItem item = _object_item_to_python(it)
132 object func 132 object func
133 tuple args 133 tuple args
134 dict kwargs 134 dict kwargs
@@ -136,7 +136,7 @@ cdef Eina_Bool py_elm_naviframe_item_pop_cb(void *data, Elm_Object_Item *it):
136 136
137 try: 137 try:
138 func, args, kwargs = item.pop_cb_spec 138 func, args, kwargs = item.pop_cb_spec
139 ret = func(*args, **kwargs) 139 ret = func(item, *args, **kwargs)
140 except Exception: 140 except Exception:
141 traceback.print_exc() 141 traceback.print_exc()
142 142
@@ -192,12 +192,9 @@ cdef class NaviframeItem(ObjectItem):
192 if isinstance(title_label, unicode): title_label = PyUnicode_AsUTF8String(title_label) 192 if isinstance(title_label, unicode): title_label = PyUnicode_AsUTF8String(title_label)
193 self.label = title_label 193 self.label = title_label
194 194
195 if prev_btn is not None: 195 self.prev_btn = prev_btn.obj if prev_btn is not None else NULL
196 self.prev_btn = prev_btn.obj 196 self.next_btn = next_btn.obj if next_btn is not None else NULL
197 if next_btn is not None: 197 self.item_content = content.obj if content is not None else NULL
198 self.next_btn = next_btn.obj
199 if content is not None:
200 self.item_content = content.obj
201 198
202 self.args = args 199 self.args = args
203 self.kwargs = kwargs 200 self.kwargs = kwargs