kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=8cc7cc74de38ef92f95ec890d8bf5010777ad2b8
commit 8cc7cc74de38ef92f95ec890d8bf5010777ad2b8
Author: Kai Huuhko <kai.huu...@gmail.com>
Date: Wed Dec 4 08:16:39 2013 +0200
Emotion: Use _set_properties_from_keyword_args
---
efl/emotion/efl.emotion.pyx | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/efl/emotion/efl.emotion.pyx b/efl/emotion/efl.emotion.pyx
index 85abd6b..88abdb0 100644
--- a/efl/emotion/efl.emotion.pyx
+++ b/efl/emotion/efl.emotion.pyx
@@ -184,16 +184,12 @@ cdef class Emotion(evasObject):
def __cinit__(self, *a, **ka):
self._emotion_callbacks = {}
- def __init__(self, Canvas canvas not None, **kargs):
+ def __init__(self, Canvas canvas not None, module_name="gstreamer",
+ module_params=None, **kwargs):
+
self._set_obj(emotion_object_add(canvas.obj))
_register_decorated_callbacks(self)
- self._set_common_params(**kargs)
- def _set_common_params(self, module_name="gstreamer",
- module_params=None, size=None, pos=None,
- geometry=None, color=None, name=None):
- evasObject._set_common_params(self, size=size, pos=pos, name=name,
- geometry=geometry, color=color)
if isinstance(module_name, unicode):
module_name = PyUnicode_AsUTF8String(module_name)
if emotion_object_init(self.obj,
@@ -207,6 +203,8 @@ cdef class Emotion(evasObject):
for opt, val in module_params.iteritems():
emotion_object_module_option_set(self.obj, opt, val)
+ self._set_properties_from_keyword_args(kwargs)
+
def __str__(self):
x, y, w, h = self.geometry_get()
r, g, b, a = self.color_get()
--
