134 files changed, 306 insertions, 404 deletions

diff --git a/ChangeLog b/ChangeLog
index 8328fbb..7e48b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+===================
+2015-08-03  v1.15.0
+===================
+
+Fixes:
+
+Improvements:
+
+Changes:
+
+Additions:
+
+Deprecation:
+
+
+===================
+2015-05-07  v1.14.0
+===================
+
+Fixes:
+
+ * Fixed evas.Textgrid to not leak on cellrow_set()
+
+
+Improvements:
+
+ * Re-added evas.SmartObject (with incompatible API compared to the earlier
+   incarnation) and made elm.Object inherit from it.
+ * Better init/shutdown management in all modules, no more need to
+   manually call those functions (no harm in doing it though).
+
+
+Changes:
+
+ * elm.List.callback_highlighted_add: Added item param to func
+ * elm.List.callback_unhighlighted_add: Added item param to func
+ * elm.Toolbar.callback_clicked_add: Added item param to func
+ * elm.Toolbar.callback_longpressed_add: Added item param to func
+ * elm.Slideshow: item_data are now a single value, instead of args/kargs,
+   like is implemented in Gengrid/Genlist
+
+
+Additions:
+
+ * evas.Smart
+ * evas.Image.orient
+ * edje.Edje.text_class_get
+ * edje.text_class_get
+ * elm.systray
+ * elm.Configuration.window_auto_focus_animate
+ * elm.Configuration.window_auto_focus_enable
+ * elm.Image.memfile_set
+ * elm.MultiButtonEntry.callback_item_longpressed_add
+ * elm.MultiButtonEntry.callback_item_longpressed_del
+ * elm.NaviframeItem.pop_cb_set
+ * elm.Photocam.image_orient
+ * elm.Scrollable.loop
+ * elm.Slider.indicator_visible_mode
+ * elm.Transit.go_in
+ * elm.on_config_all_changed
+ * elm.on_ethumb_connect
+ * elm.on_policy_changed
+ * elm.on_process_background
+ * elm.LayoutClass.file is now also readable
+ * elm.Video.file is now also readable
+
+
+Deprecation:
+
+ * evas.Rect.intercepts: Use intersects() instead
+
 
 ===================
 2015-02-09  v1.13.0
@@ -51,7 +122,8 @@ Deprecation:
 
  * elm.Configuration.engine
  * elm.Configuration.preferred_engine
- 
+
+
 ===================
 2014-11-23  v1.12.0
 ===================
diff --git a/TODO b/TODO
index 799a0b4..516d3c5 100644
--- a/TODO
+++ b/TODO
@@ -43,4 +43,3 @@ Elm
    - video
    - web
    - window ?
-* How are the ecore events managed? for example: ELM_EVENT_PROCESS_FOREGROUND
diff --git a/api_coverage.py b/api_coverage.py
index e51624f..f08a783 100755
--- a/api_coverage.py
+++ b/api_coverage.py
@@ -55,8 +55,6 @@ params = {
     "elementary": ("efl/elementary", "Elementary", "elm"),
 }
 
-EFL_MIN_VERSION = "1.9.99"
-
 parser = argparse.ArgumentParser(
     description="Reports EFL vs. Python-EFL API functions coverage"
     )
@@ -205,7 +203,7 @@ print("")
 
 for lib in args.libs:
 
-    inc_paths = pkg_config(lib, EFL_MIN_VERSION)
+    inc_paths = pkg_config(lib)
     inc_path = None
     for p in inc_paths:
         if lib in p:
diff --git a/efl/__init__.py b/efl/__init__.py
index 87a9116..480cbbe 100644
--- a/efl/__init__.py
+++ b/efl/__init__.py
@@ -20,5 +20,5 @@
 # pre-release: "1.13.0-beta1" ( 1, 13, 0 )
 # release:     "1.13.0" ( 1, 13, 0 )
 
-__version__ = "1.13.99"
-__version_info__ = ( 1, 13, 99 )
+__version__ = "1.14.99"
+__version_info__ = ( 1, 14, 99 )
diff --git a/efl/ecore_x/efl.ecore_x.pyx b/efl/ecore_x/efl.ecore_x.pyx
index 4baf32b..cf0e90e 100644
--- a/efl/ecore_x/efl.ecore_x.pyx
+++ b/efl/ecore_x/efl.ecore_x.pyx
@@ -19,6 +19,8 @@
 from cpython cimport PyMem_Malloc, PyMem_Free, PyUnicode_AsUTF8String
 from efl.utils.deprecated cimport DEPRECATED
 
+import atexit
+
 
 def init(name=None):
     """Initialize the X display connection to the given display.
@@ -322,3 +324,6 @@ def cursor_free(Ecore_X_Cursor c):
 
 include "efl.ecore_x_window.pxi"
 include "efl.ecore_x_events.pxi"
+
+init()
+atexit.register(shutdown)
diff --git a/efl/edje/efl.edje.pyx b/efl/edje/efl.edje.pyx
index b9201c6..dad8ff4 100644
--- a/efl/edje/efl.edje.pyx
+++ b/efl/edje/efl.edje.pyx
@@ -30,10 +30,6 @@ Classes
 
 """
 
-
-import traceback
-import warnings
-
 from cpython cimport PyMem_Malloc, PyMem_Free, PyUnicode_AsUTF8String
 cimport libc.stdlib
 from libc.stdint cimport uintptr_t
@@ -45,6 +41,9 @@ from efl.eo cimport _object_mapping_register, object_from_instance, \
 from efl.utils.conversions cimport _ctouni, _touni, \
     eina_list_strings_to_python_list
 
+import traceback
+import warnings
+import atexit
 
 
 def init():
@@ -288,3 +287,4 @@ include "efl.edje_object.pxi"
 
 
 init()
+atexit.register(shutdown)
diff --git a/efl/elementary/slideshow.pxi b/efl/elementary/slideshow.pxi
index b94caab..65a7892 100644
--- a/efl/elementary/slideshow.pxi
+++ b/efl/elementary/slideshow.pxi
@@ -19,9 +19,10 @@
 include "slideshow_cdef.pxi"
 
 cdef Evas_Object *_py_elm_slideshow_item_get(void *data, Evas_Object *obj) with gil:
-    cdef SlideshowItem item = <object>data
-    cdef evasObject icon
-    cdef SlideshowItemClass itc = item.cls
+    cdef:
+        SlideshowItem item = <SlideshowItem>data
+        SlideshowItemClass itc = item.item_class
+        evasObject icon
 
     func = itc._get_func
     if func is None:
@@ -29,37 +30,39 @@ cdef Evas_Object *_py_elm_slideshow_item_get(void *data, Evas_Object *obj) with
 
     try:
         o = object_from_instance(obj)
-        ret = func(o, *item.args, **item.kwargs)
+        icon = func(o, item.item_data)
     except Exception:
         traceback.print_exc()
         return NULL
 
-    if ret is None:
+    if icon is not None:
+        return icon.obj
+    else:
         return NULL
 
-    icon = ret
-    return icon.obj
 
 cdef void _py_elm_slideshow_item_del(void *data, Evas_Object *obj) with gil:
-    cdef SlideshowItem item = <object>data
-    cdef SlideshowItemClass itc = item.cls
+    cdef:
+        SlideshowItem item = <SlideshowItem>data
+        SlideshowItemClass itc = item.item_class
 
     func = itc._del_func
     if func is not None:
         try:
             o = object_from_instance(obj)
-            func(o, *item.args, **item.kwargs)
+            func(o, item.item_data)
         except Exception:
             traceback.print_exc()
 
     # XXX: SlideShow item handling is weird
-    #item._unset_obj()
+    # item._unset_obj()
     #Py_DECREF(item)
 
 cdef int _py_elm_slideshow_compare_func(const void *data1, const void *data2) with gil:
-    cdef SlideshowItem item1    = <object>data1
-    cdef SlideshowItem item2    = <object>data2
-    cdef object func            = item1.compare_func
+    cdef:
+        SlideshowItem item1 = <SlideshowItem>data1
+        SlideshowItem item2 = <SlideshowItem>data2
+        object func = item1.compare_func
 
     if func is None:
         return 0
@@ -101,17 +104,17 @@ cdef class SlideshowItemClass (object):
         ``func(obj, item_data)``
 
     .. note:: In all these signatures, 'obj' means Slideshow and
-        'item_data' is the value given to Slideshow item append/prepend
+        'item_data' is the value given to Slideshow item add/sorted_insert
         methods, it should represent your item model as you want.
 
     """
-    cdef Elm_Slideshow_Item_Class obj
+    cdef Elm_Slideshow_Item_Class cls
     cdef readonly object _get_func
     cdef readonly object _del_func
 
-    def __cinit__(self, *a, **ka):
-        self.obj.func.get = _py_elm_slideshow_item_get
-        self.obj.func.del_ = _py_elm_slideshow_item_del
+    def __cinit__(self):
+        self.cls.func.get = _py_elm_slideshow_item_get
+        self.cls.func.del_ = _py_elm_slideshow_item_del
 
     def __init__(self, get_func=None, del_func=None):
         if get_func and not callable(get_func):
@@ -137,7 +140,7 @@ cdef class SlideshowItemClass (object):
                (type(self).__name__,
                 <uintptr_t><void *>self,
                 PY_REFCOUNT(self),
-                <uintptr_t>&self.obj,
+                <uintptr_t>&self.cls,
                 self._get_func,
                 self._del_func)
 
@@ -145,7 +148,7 @@ cdef class SlideshowItemClass (object):
         """To be called by Slideshow for each item to get its icon.
 
         :param obj: the Slideshow instance
-        :param item_data: the value given to slideshow append/prepend.
+        :param item_data: the value given to slideshow item_add func.
 
         :return: icon object to be used and swallowed.
         :rtype: evas Object or None
@@ -160,8 +163,8 @@ cdef class SlideshowItem(ObjectItem):
     """
 
     cdef:
-        SlideshowItemClass cls
-        object compare_func
+        readonly SlideshowItemClass item_class
+        object item_data, compare_func
 
     cdef int _set_obj(self, Elm_Object_Item *item) except 0:
         assert self.item == NULL, "Object must be clean"
@@ -173,8 +176,10 @@ cdef class SlideshowItem(ObjectItem):
         assert self.item != NULL, "Object must wrap something"
         self.item = NULL
 
-    def __init__(self, SlideshowItemClass item_class not None, *args, **kwargs):
-        self.cls = item_class
+    def __init__(self, SlideshowItemClass item_class not None,
+                 item_data=None, *args, **kwargs):
+        self.item_class = item_class
+        self.item_data = item_data
         self.args = args
         self.kwargs = kwargs
 
@@ -184,9 +189,25 @@ cdef class SlideshowItem(ObjectItem):
                (type(self).__name__,
                 <uintptr_t><void*>self,
                 PY_REFCOUNT(self),
-                <uintptr_t>self.obj,
-                type(self.cls).__name__,
-                self.args)
+                <uintptr_t>self.item,
+                type(self.item_class).__name__,
+                self.item_data)
+
+    property data:
+        """ The data (model) associated with this item.
+
+        This is the data that has been passed to the add/sorted_insert
+        functions, and the same that you get in the ItemClass get and delete
+        functions.
+
+        .. versionadded:: 1.14
+
+        """
+        def __get__(self):
+            return self.item_data
+
+    def data_get(self):
+        return self.item_data
 
     def add_to(self, Slideshow slideshow not None):
         """Add (append) a new item in a given slideshow widget.
@@ -212,7 +233,8 @@ cdef class SlideshowItem(ObjectItem):
         """
         cdef Elm_Object_Item *item
 
-        item = elm_slideshow_item_add(slideshow.obj, &self.cls.obj, <void*>self)
+        item = elm_slideshow_item_add(slideshow.obj, &self.item_class.cls,
+                                      <void*>self)
 
         if item == NULL:
             raise RuntimeError("The item could not be added to the widget.")
@@ -256,8 +278,8 @@ cdef class SlideshowItem(ObjectItem):
         self.compare_func = func
         compare = _py_elm_slideshow_compare_func
 
-        item = elm_slideshow_item_sorted_insert(slideshow.obj, &self.cls.obj, \
-            <void*>self, compare)
+        item = elm_slideshow_item_sorted_insert(slideshow.obj,
+                                    &self.item_class.cls, <void*>self, compare)
 
         if item == NULL:
             raise RuntimeError("The item could not be added to the widget.")
@@ -316,7 +338,7 @@ cdef class Slideshow(LayoutClass):
         self._set_obj(elm_slideshow_add(parent.obj))
         self._set_properties_from_keyword_args(kwargs)
 
-    def item_add(self, SlideshowItemClass item_class not None, *args, **kwargs):
+    def item_add(self, SlideshowItemClass item_class not None, item_data):
         """Add (append) a new item in a given slideshow widget.
 
         Add a new item to ``obj's`` internal list of items, appending it.
@@ -334,14 +356,19 @@ cdef class Slideshow(LayoutClass):
         :param item_class: The item class for the item
         :type item_class: :py:class:`SlideshowItemClass`
 
+        :param item_data: The data (model) associated with this item
+
         :return: A handle to the item added or ``None``, on errors
         :rtype: :py:class:`SlideshowItem`
 
+        .. versionchanged:: 1.14
+            use item_data param instead or args/kargs
+
         """
-        return SlideshowItem(item_class, *args, **kwargs).add_to(self)
+        return SlideshowItem(item_class, item_data).add_to(self)
 
     def item_sorted_insert(self, SlideshowItemClass item_class not None,
-                            func not None, *args, **kwargs):
+                            func not None, item_data):
         """Insert a new item into the given slideshow widget, using the ``func``
         function to sort items (by item handles).
 
@@ -363,11 +390,18 @@ cdef class Slideshow(LayoutClass):
         :param itc: The item class for the item
         :param func: The comparing function to be used to sort slideshow
             items **by SlideshowItemClass item handles**
-        :return: Returns The slideshow item handle, on success, or
-            ``None``, on errors
+
+        :param item_data: The data (model) associated with this item
+
+        :return: A handle to the item added or ``None``, on errors
+        :rtype: :py:class:`SlideshowItem`
+
+        .. versionchanged:: 1.14
+            use item_data param instead or args/kargs
+
 
         """
-        return SlideshowItem(item_class, *args, **kwargs).sorted_insert(self, func)
+        return SlideshowItem(item_class, item_data).sorted_insert(self, func)
 
     def next(self):
         """Slide to the **next** item, in a given slideshow widget
diff --git a/efl/emotion/efl.emotion.pyx b/efl/emotion/efl.emotion.pyx
index 809d250..ffe1318 100644
--- a/efl/emotion/efl.emotion.pyx
+++ b/efl/emotion/efl.emotion.pyx
@@ -41,6 +41,8 @@ from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Canvas, evas_object_smart_callback_add, \
     evas_object_smart_callback_del
 
+import atexit
+
 
 cdef void _emotion_callback(void *data, Evas_Object *o, void *ei) with gil:
     cdef Emotion obj
@@ -1285,3 +1287,4 @@ _object_mapping_register("Emotion_Object", Emotion)
 
 
 init()
+atexit.register(shutdown)
diff --git a/efl/ethumb/efl.ethumb.pyx b/efl/ethumb/efl.ethumb.pyx
index 9f6f831..573f811 100644
--- a/efl/ethumb/efl.ethumb.pyx
+++ b/efl/ethumb/efl.ethumb.pyx
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
+import atexit
+
 def init():
     return ethumb_init()
 
@@ -28,3 +30,4 @@ cdef class PyEthumb:
 
 
 init()
+atexit.register(shutdown)
diff --git a/efl/evas/efl.evas_object_textgrid.pxi b/efl/evas/efl.evas_object_textgrid.pxi
index 9b93cc4..68e579d 100644
--- a/efl/evas/efl.evas_object_textgrid.pxi
+++ b/efl/evas/efl.evas_object_textgrid.pxi
@@ -42,6 +42,14 @@ cdef class TextgridCell(object):
             self.fg_extended, self.bg_extended,
             self.double_width)
 
+    @staticmethod
+    cdef TextgridCell create(Evas_Textgrid_Cell *cell):
+        if cell == NULL:
+            raise ValueError("Invalid pointer for evas textgrid cell!")
+        cdef TextgridCell ret = TextgridCell.__new__(TextgridCell)
+        ret.cell = cell
+        return ret
+
     property codepoint:
         """the UNICODE value of the character
 
@@ -167,6 +175,35 @@ cdef class TextgridCell(object):
         def __get__(self):
             return <bint>self.cell.double_width
 
+
+cdef class TextgridCellRow:
+
+    cdef:
+        Evas_Textgrid_Cell *row
+        unsigned int rowsize
+
+    @staticmethod
+    cdef TextgridCellRow create(Evas_Textgrid_Cell *row, unsigned int rowsize):
+        if row == NULL:
+            raise ValueError("Invalid pointer for evas textgrid cell row!")
+        cdef TextgridCellRow ret = TextgridCellRow.__new__(TextgridCellRow)
+        ret.row = row
+        ret.rowsize = rowsize
+        return ret
+
+    def __len__(self):
+        return self.rowsize
+
+    def __getitem__(self, x):
+        if x > self.rowsize - 1:
+            raise IndexError
+        if x < 0:
+            x = self.rowsize - x
+        if x < 0:
+            raise IndexError
+        return TextgridCell.create(&self.row[x])
+
+
 cdef class Textgrid(Object):
     """
 
@@ -343,13 +380,13 @@ cdef class Textgrid(Object):
         def __get__(self):
             return evas_object_textgrid_supported_font_styles_get(self.obj)
 
-    def cellrow_set(self, int y, list row not None):
+    def cellrow_set(self, int y, TextgridCellRow row not None):
         """Set the string at the given row.
 
         :param y: The row index of the grid.
         :type y: int
         :param row: The string as a sequence of :class:`TextgridCell`.
-        :type row: list
+        :type row: :class:`TextgridCellRow`
 
         This method allows returning cells to the textgrid, retrieved with
         :py:meth:`cellrow_get`.
@@ -361,26 +398,14 @@ cdef class Textgrid(Object):
             :py:meth:`update_add`
 
         """
-        cdef:
-            TextgridCell cell
-            Evas_Textgrid_Cell **crow
-            int rlen = len(row)
-            int i
-
-        crow = <Evas_Textgrid_Cell **>malloc(rlen * sizeof(Evas_Textgrid_Cell *))
-
-        for i in range(rlen):
-            cell = row[i]
-            crow[i] = cell.cell
-
-        evas_object_textgrid_cellrow_set(self.obj, y, crow[0])
+        evas_object_textgrid_cellrow_set(self.obj, y, row.row)
 
     def cellrow_get(self, int y):
         """Get the string at the given row.
 
         :param int y: The row index of the grid.
         :return: A list of :class:`TextgridCell`
-        :rtype: list
+        :rtype: :class:`TextgridCellRow`
 
         This method returns a list of cells in the line **y** of
         the textgrid object. If **y** is not between 0 and the number
@@ -393,21 +418,8 @@ cdef class Textgrid(Object):
             :py:meth:`update_add`
 
         """
-        cdef:
-            Evas_Textgrid_Cell *row = evas_object_textgrid_cellrow_get(self.obj, y)
-            int i
-            list ret = []
-            TextgridCell cell
-
-        if row == NULL:
-            return None
-
-        for i in range(self.size[0]):
-            cell = TextgridCell.__new__(TextgridCell)
-            cell.cell = &row[i]
-            ret.append(cell)
-
-        return ret
+        return TextgridCellRow.create(
+            evas_object_textgrid_cellrow_get(self.obj, y), self.size[0])
 
     def update_add(self, int x, int y, int w, int h):
         """Indicate for evas that part of a textgrid region (cells) has been updated.
diff --git a/examples/dbus/test_dbus_spy.py b/examples/dbus/test_dbus_spy.py
index 65b8fb8..f89b7b8 100755
--- a/examples/dbus/test_dbus_spy.py
+++ b/examples/dbus/test_dbus_spy.py
@@ -20,7 +20,9 @@ from efl.elementary.label import Label
 from efl.elementary.panes import Panes
 from efl.elementary.popup import Popup
 from efl.elementary.separator import Separator
-from efl.elementary.genlist import Genlist, GenlistItem, GenlistItemClass
+from efl.elementary.genlist import Genlist, GenlistItemClass, \
+    ELM_GENLIST_ITEM_GROUP, ELM_GENLIST_ITEM_TREE, \
+    ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY
 from efl.dbus_mainloop import DBusEcoreMainLoop
 
 
@@ -48,7 +50,7 @@ class DBusNode(object):
     @property
     def name(self):
         return self._name
-    
+
     @property
     def parent(self):
         return self._parent
@@ -72,17 +74,17 @@ class DBusInterface(DBusNode):
         self._properties = []
         self._methods = []
         self._signals = []
-        
+
         parent_obj.interfaces.append(self)
-    
+
     @property
     def properties(self):
         return self._properties
-    
+
     @property
     def methods(self):
         return self._methods
-    
+
     @property
     def signals(self):
         return self._signals
@@ -184,7 +186,7 @@ def recursive_introspect(bus, named_service, object_path, ret_data=None):
         # found a new object
         obj = DBusObject(object_path, named_service)
         ret_data.append(obj)
-    
+
     for xml_node in xml_root:
         # found an interface
         if xml_node.tag == 'interface':
@@ -253,12 +255,12 @@ class NamesList(Genlist):
 
         # add private & public group items
         self.public_group = self.item_append(self.itc_g, "Public Services",
-                               flags=elm.ELM_GENLIST_ITEM_GROUP)
-        self.public_group.select_mode_set(elm.ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
-        
+                               flags=ELM_GENLIST_ITEM_GROUP)
+        self.public_group.select_mode_set(ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
+
         self.private_group = self.item_append(self.itc_g, "Private Services",
-                               flags=elm.ELM_GENLIST_ITEM_GROUP)
-        self.private_group.select_mode_set(elm.ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
+                               flags=ELM_GENLIST_ITEM_GROUP)
+        self.private_group.select_mode_set(ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
 
         # populate the genlist
         self.populate()
@@ -269,11 +271,11 @@ class NamesList(Genlist):
 
         # keep the list updated when a name changes
         if self.sig1: self.sig1.remove()
-        self.sig1 = bus.add_signal_receiver(self.name_owner_changed_cb, 
+        self.sig1 = bus.add_signal_receiver(self.name_owner_changed_cb,
                                             "NameOwnerChanged")
         # bus.add_signal_receiver(self.name_acquired_cb, "NameAcquired")
         # bus.add_signal_receiver(self.name_lost_cb, "NameLost")
-    
+
     def clear(self):
         self.public_group.subitems_clear()
         self.private_group.subitems_clear()
@@ -281,10 +283,10 @@ class NamesList(Genlist):
     def item_selected_cb(self, gl, item):
         name = item.data
         self.win.detail_list.populate(name)
-    
+
     def sort_cb(self, it1, it2):
         return 1 if it1.data.lower() < it2.data.lower() else -1
-        
+
 
     def service_add(self, name):
         print("service_add('%s')" % name)
@@ -302,7 +304,7 @@ class NamesList(Genlist):
                 item.delete()
                 return
             item = item.next
-        
+
     def name_owner_changed_cb(self, name, old_owner, new_owner):
         print("NameOwnerChanged(name='%s', old_owner='%s', new_owner='%s')" %
               (name, old_owner, new_owner))
@@ -352,8 +354,8 @@ class DetailList(Genlist):
         self.callback_contract_request_add(self.contract_request_cb)
         self.callback_contracted_add(self.contracted_cb)
         self.callback_clicked_double_add(self.double_click_cb)
-        
-        
+
+
     def populate(self, name):
         print("populate: %s" % name)
         self.clear()
@@ -361,9 +363,9 @@ class DetailList(Genlist):
         # objects
         for obj in recursive_introspect(bus, name, '/'):
             obj_item = self.item_append(self.itc_g, obj,
-                                        flags=elm.ELM_GENLIST_ITEM_GROUP)
-            obj_item.select_mode_set(elm.ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
-            
+                                        flags=ELM_GENLIST_ITEM_GROUP)
+            obj_item.select_mode_set(ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
+
             # interfaces
             for iface in obj.interfaces:
                 if options.hide_introspect_stuff and \
@@ -371,7 +373,7 @@ class DetailList(Genlist):
                   continue
                 iface_item = self.item_append(self.itc, iface,
                                               parent_item=obj_item,
-                                              flags=elm.ELM_GENLIST_ITEM_TREE)
+                                              flags=ELM_GENLIST_ITEM_TREE)
 
     def sort_cb(self, it1, it2):
         pri1 = pri2 = 0
@@ -392,7 +394,7 @@ class DetailList(Genlist):
         iface = item.data
         for obj in iface.properties + iface.methods + iface.signals:
             self.item_sorted_insert(self.itc, obj, self.sort_cb, parent_item=item)
-    
+
     def contract_request_cb(self, genlist, item):
         item.expanded = False
 
@@ -447,7 +449,7 @@ class MethodRunner(Popup):
             sp.horizontal = True
             sp.show()
             vbox.pack_end(sp)
-        
+
         # returns label + entry
         label = Label(parent)
         label.size_hint_align = 0.0, 0.5
@@ -558,13 +560,13 @@ class MyWin(StandardWindow):
         self.resize_object_add(box)
         box.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
         box.show()
-        
+
         flip = FlipSelector(self)
         flip.item_append("Session Bus", self.flip_selected_cb, session_bus)
         flip.item_append("System Bus", self.flip_selected_cb, system_bus)
         box.pack_end(flip)
         flip.show()
-        
+
         panes = Panes(self)
         panes.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
         panes.size_hint_align = (evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
@@ -594,8 +596,5 @@ class MyWin(StandardWindow):
 
 
 if __name__ == "__main__":
-    elm.init()
     win = MyWin()
     elm.run()
-    elm.shutdown()
-
diff --git a/examples/ecore/x/mplayer_embed.py b/examples/ecore/x/mplayer_embed.py
index 079ded0..6586ad1 100644
--- a/examples/ecore/x/mplayer_embed.py
+++ b/examples/ecore/x/mplayer_embed.py
@@ -2,14 +2,13 @@
 
 import sys
 import efl.ecore
-from efl.ecore.x import init, Window, on_window_configure_add
+from efl.ecore_x import Window, on_window_configure_add
 from subprocess import Popen, PIPE
 
-init()
 
 try:
     filename = sys.argv[1]
-except IndexError, e:
+except IndexError:
     raise SystemExit("Usage: %s <filename>" % sys.argv[0])
 
 main_window = Window(w=800, h=600)
@@ -40,5 +39,5 @@ def on_configure(event, main_window, sub_window):
 on_window_configure_add(on_configure, main_window, sub_window)
 
 efl.ecore.fd_handler_add(
-    p.stdout, efl.ecore.ECORE_FD_ALL, handle_read, p.stdout)
+    p.stdout, efl.ecore_x.ECORE_FD_ALL, handle_read, p.stdout)
 efl.ecore.main_loop_begin()
diff --git a/examples/ecore/x/window_creation.py b/examples/ecore/x/window_creation.py
index 61c455a..5dc2268 100644
--- a/examples/ecore/x/window_creation.py
+++ b/examples/ecore/x/window_creation.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 
 import efl.ecore
-from efl.ecore.x import init, Window, on_window_configure_add
+from efl.ecore_x import Window, on_window_configure_add
 
-init()
 
 # method 1
 main_window = Window(w=800, h=600)
diff --git a/examples/elementary/test.py b/examples/elementary/test.py
index e306cc0..0878178 100755
--- a/examples/elementary/test.py
+++ b/examples/elementary/test.py
@@ -309,7 +309,6 @@ def cb_filter(en, win):
     menu_create(en.text_get(), win)
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "Python EFL test application")
     win.callback_delete_request_add(destroy, "test1", "test2",
                                     str3="test3", str4="test4")
@@ -364,4 +363,3 @@ if __name__ == "__main__":
     win.resize(480, 480)
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_3d.py b/examples/elementary/test_3d.py
index 2e7b303..1ab4b34 100644
--- a/examples/elementary/test_3d.py
+++ b/examples/elementary/test_3d.py
@@ -224,10 +224,8 @@ def evas3d_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     evas3d_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_access.py b/examples/elementary/test_access.py
index 88b3e90..b514972 100644
--- a/examples/elementary/test_access.py
+++ b/examples/elementary/test_access.py
@@ -284,7 +284,6 @@ def access_clicked(obj, item=None):
 #     evas_object_show(win)
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -320,4 +319,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_actionslider.py b/examples/elementary/test_actionslider.py
index 5a9a0cf..e43fb69 100644
--- a/examples/elementary/test_actionslider.py
+++ b/examples/elementary/test_actionslider.py
@@ -143,9 +143,7 @@ def actionslider_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     actionslider_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_bg.py b/examples/elementary/test_bg.py
index 35e5962..a593420 100644
--- a/examples/elementary/test_bg.py
+++ b/examples/elementary/test_bg.py
@@ -44,7 +44,6 @@ def bg_image_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application", size=(320,520))
     win.callback_delete_request_add(lambda x: elementary.exit())
 
@@ -76,5 +75,4 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_box.py b/examples/elementary/test_box.py
index dfc9048..14d4cd2 100644
--- a/examples/elementary/test_box.py
+++ b/examples/elementary/test_box.py
@@ -167,7 +167,6 @@ def box_transition_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda x: elementary.exit())
@@ -203,5 +202,4 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_bubble.py b/examples/elementary/test_bubble.py
index 35c5b0a..c0ff0f4 100644
--- a/examples/elementary/test_bubble.py
+++ b/examples/elementary/test_bubble.py
@@ -83,7 +83,6 @@ def bubble_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda x: elementary.exit())
@@ -116,4 +115,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_button.py b/examples/elementary/test_button.py
index c2c0536..d973055 100644
--- a/examples/elementary/test_button.py
+++ b/examples/elementary/test_button.py
@@ -52,10 +52,8 @@ def buttons_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     buttons_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_calendar.py b/examples/elementary/test_calendar.py
index 6727b79..089fbbe 100644
--- a/examples/elementary/test_calendar.py
+++ b/examples/elementary/test_calendar.py
@@ -231,7 +231,6 @@ def calendar3_clicked(obj, item=None):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -267,4 +266,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_check.py b/examples/elementary/test_check.py
index 5b54b7e..e32adb4 100644
--- a/examples/elementary/test_check.py
+++ b/examples/elementary/test_check.py
@@ -82,10 +82,8 @@ def check_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     check_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_clock.py b/examples/elementary/test_clock.py
index 7361ffa..111d0fd 100644
--- a/examples/elementary/test_clock.py
+++ b/examples/elementary/test_clock.py
@@ -77,10 +77,8 @@ def clock_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     clock_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_cnp.py b/examples/elementary/test_cnp.py
index 01ee024..975a30f 100644
--- a/examples/elementary/test_cnp.py
+++ b/examples/elementary/test_cnp.py
@@ -78,9 +78,7 @@ def cnp_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     cnp_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_colorselector.py b/examples/elementary/test_colorselector.py
index ef03bf9..6877a7c 100644
--- a/examples/elementary/test_colorselector.py
+++ b/examples/elementary/test_colorselector.py
@@ -139,10 +139,8 @@ def colorselector_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     colorselector_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_config.py b/examples/elementary/test_config.py
index 40df48e..fb7f972 100644
--- a/examples/elementary/test_config.py
+++ b/examples/elementary/test_config.py
@@ -356,9 +356,7 @@ def config_clicked(obj, data=None):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     config_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_conform.py b/examples/elementary/test_conform.py
index bd1f7ad..41f896e 100644
--- a/examples/elementary/test_conform.py
+++ b/examples/elementary/test_conform.py
@@ -152,7 +152,6 @@ def conformant2_clicked(obj, item=None):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -187,4 +186,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_core_ecore_events_in_elm.py b/examples/elementary/test_core_ecore_events_in_elm.py
index 10a90a0..0e52bec 100644
--- a/examples/elementary/test_core_ecore_events_in_elm.py
+++ b/examples/elementary/test_core_ecore_events_in_elm.py
@@ -77,9 +77,7 @@ def core_ecore_events_in_elm_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     core_ecore_events_in_elm_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_core_evas_canvas_callbacks.py b/examples/elementary/test_core_evas_canvas_callbacks.py
index bf78f80..add53ae 100644
--- a/examples/elementary/test_core_evas_canvas_callbacks.py
+++ b/examples/elementary/test_core_evas_canvas_callbacks.py
@@ -87,10 +87,8 @@ def core_evas_canvas_callbacks_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     core_evas_canvas_callbacks_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_core_evas_object_callbacks.py b/examples/elementary/test_core_evas_object_callbacks.py
index 9961500..a86f887 100644
--- a/examples/elementary/test_core_evas_object_callbacks.py
+++ b/examples/elementary/test_core_evas_object_callbacks.py
@@ -151,9 +151,7 @@ def core_evas_object_callbacks_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     core_evas_object_callbacks_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_core_evas_objects.py b/examples/elementary/test_core_evas_objects.py
index 5172170..1d98242 100644
--- a/examples/elementary/test_core_evas_objects.py
+++ b/examples/elementary/test_core_evas_objects.py
@@ -47,10 +47,8 @@ def core_evas_objects_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     core_evas_objects_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_core_evas_smart.py b/examples/elementary/test_core_evas_smart.py
index adb73fc..a5422ad 100644
--- a/examples/elementary/test_core_evas_smart.py
+++ b/examples/elementary/test_core_evas_smart.py
@@ -203,7 +203,5 @@ if __name__ == "__main__":
     efl_log_handler = logging.StreamHandler()
     efl_log_handler.setFormatter(efl_log_form)
     efl_log.addHandler(efl_log_handler)
-    elementary.init()
     core_evas_smart_clicked(None)
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_ctxpopup.py b/examples/elementary/test_ctxpopup.py
index a945651..fbe154a 100644
--- a/examples/elementary/test_ctxpopup.py
+++ b/examples/elementary/test_ctxpopup.py
@@ -187,10 +187,8 @@ def ctxpopup_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     ctxpopup_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_cursor.py b/examples/elementary/test_cursor.py
index a079392..9f71758 100644
--- a/examples/elementary/test_cursor.py
+++ b/examples/elementary/test_cursor.py
@@ -164,7 +164,6 @@ def cursor3_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -198,4 +197,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_datetime.py b/examples/elementary/test_datetime.py
index ddaa6c3..9d218ec 100644
--- a/examples/elementary/test_datetime.py
+++ b/examples/elementary/test_datetime.py
@@ -60,9 +60,7 @@ def datetime_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     datetime_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_dayselector.py b/examples/elementary/test_dayselector.py
index 877d500..1d9d77c 100644
--- a/examples/elementary/test_dayselector.py
+++ b/examples/elementary/test_dayselector.py
@@ -68,10 +68,8 @@ def dayselector_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     dayselector_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_diskselector.py b/examples/elementary/test_diskselector.py
index a2e4bea..4c30089 100644
--- a/examples/elementary/test_diskselector.py
+++ b/examples/elementary/test_diskselector.py
@@ -108,9 +108,7 @@ def diskselector_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     diskselector_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_dnd.py b/examples/elementary/test_dnd.py
index 4c33e9c..c495be2 100644
--- a/examples/elementary/test_dnd.py
+++ b/examples/elementary/test_dnd.py
@@ -577,7 +577,6 @@ def dnd_genlist_gengrid_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -613,4 +612,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_entry.py b/examples/elementary/test_entry.py
index de896d7..637343d 100644
--- a/examples/elementary/test_entry.py
+++ b/examples/elementary/test_entry.py
@@ -448,7 +448,6 @@ def entry_notepad_clicked(obj, item=None):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
                          size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -484,4 +483,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_evas_textgrid.py b/examples/elementary/test_evas_textgrid.py
index 5fce834..c6a547d 100644
--- a/examples/elementary/test_evas_textgrid.py
+++ b/examples/elementary/test_evas_textgrid.py
@@ -5,45 +5,54 @@ from efl import evas
 from efl.evas import Textgrid, EVAS_TEXTGRID_PALETTE_STANDARD
 from efl import elementary
 from efl.elementary.window import StandardWindow
-from efl.elementary.background import Background
+
+if "unichr" not in dir(__builtins__):
+    unichr = chr
 
 
 def evas_textgrid_clicked(obj, item=None):
-    win = StandardWindow("evastextgrid", "Evas Textgrid Test", autodel=True,
-        size=(320, 320))
+    win = StandardWindow(
+        "evastextgrid", "Evas Textgrid Test", autodel=True)
     if obj is None:
         win.callback_delete_request_add(lambda o: elementary.exit())
 
-    tg = Textgrid(win.evas)
-    tg.size = 15, 1
-    tg.size_hint_weight_set(1.0, 1.0)
+    W = 80
+    H = 26
+
+    tg = Textgrid(
+        win.evas, size_hint_weight=(1.0, 1.0), size=(W, H),
+        font=("monospace", 14))
     win.resize_object_add(tg)
-    tg.font = "Courier", 20
     tg.palette_set(EVAS_TEXTGRID_PALETTE_STANDARD, 0, 0, 0, 0, 255)
-    tg.palette_set(EVAS_TEXTGRID_PALETTE_STANDARD, 1, 255, 255, 255, 255)
 
-    row = tg.cellrow_get(0)
-    for cell in row:
-        cell.codepoint="ö"
-        cell.fg = 1
-        cell.bg = 0
-    tg.cellrow_set(0, row)
+    win.size_step = tg.cell_size
 
-    tg.show()
-    tg.update_add(0, 0, 10, 1)
+    # XXX: Add 1 to size, else the last row/col won't fit. Unknown reason.
+    win.size = (W * tg.cell_size[0] + 1, H * tg.cell_size[1] + 1)
 
-    rowback = tg.cellrow_get(0)
+    for i in range(H):
+        ci = i + 1
+        cv = ci * 9
+        tg.palette_set(
+            EVAS_TEXTGRID_PALETTE_STANDARD, ci, cv, cv, cv, 255)
+        row = tg.cellrow_get(i)
+        if row is not None:
+            for cell in row:
+                cell.codepoint = unichr(1000 + i)
+                cell.bg = 0
+                cell.fg = ci
+            tg.cellrow_set(i, row)
+
+    tg.show()
+    tg.update_add(0, 0, 80, 26)
 
     win.show()
 
 
 if __name__ == "__main__":
     evas.init()
-    elementary.init()
 
     evas_textgrid_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
     evas.shutdown()
-
diff --git a/examples/elementary/test_external.py b/examples/elementary/test_external.py
index e575ed7..2fd08a8 100644
--- a/examples/elementary/test_external.py
+++ b/examples/elementary/test_external.py
@@ -130,7 +130,6 @@ def edje_external_video_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -166,4 +165,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_fileselector.py b/examples/elementary/test_fileselector.py
index 50840f6..0e1ebb2 100644
--- a/examples/elementary/test_fileselector.py
+++ b/examples/elementary/test_fileselector.py
@@ -260,9 +260,7 @@ def fileselector_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     fileselector_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_fileselector_button.py b/examples/elementary/test_fileselector_button.py
index dd50db0..f6e32ee 100644
--- a/examples/elementary/test_fileselector_button.py
+++ b/examples/elementary/test_fileselector_button.py
@@ -85,7 +85,6 @@ def fileselector_button_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     import logging
     efl_log = logging.getLogger("efl")
@@ -94,4 +93,3 @@ if __name__ == "__main__":
     fileselector_button_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_fileselector_entry.py b/examples/elementary/test_fileselector_entry.py
index 8a09ae1..92ffd96 100644
--- a/examples/elementary/test_fileselector_entry.py
+++ b/examples/elementary/test_fileselector_entry.py
@@ -85,7 +85,6 @@ def fileselector_entry_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     import logging
     efl_log = logging.getLogger("efl")
@@ -94,4 +93,3 @@ if __name__ == "__main__":
     fileselector_entry_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_flip.py b/examples/elementary/test_flip.py
index 6501b6a..9b9719c 100644
--- a/examples/elementary/test_flip.py
+++ b/examples/elementary/test_flip.py
@@ -212,7 +212,6 @@ def flip_interactive_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -246,4 +245,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_flipselector.py b/examples/elementary/test_flipselector.py
index 5c66e79..b34c417 100644
--- a/examples/elementary/test_flipselector.py
+++ b/examples/elementary/test_flipselector.py
@@ -118,9 +118,7 @@ def flipselector_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     flipselector_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_floating.py b/examples/elementary/test_floating.py
index 1be0d64..bf442e4 100644
--- a/examples/elementary/test_floating.py
+++ b/examples/elementary/test_floating.py
@@ -59,9 +59,7 @@ def floating_clicked(obj):
         win.callback_delete_request_add(lambda o: elementary.exit())
 
 if __name__ == "__main__":
-    elementary.init()
 
     floating_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_focus.py b/examples/elementary/test_focus.py
index ef26098..70d1616 100644
--- a/examples/elementary/test_focus.py
+++ b/examples/elementary/test_focus.py
@@ -554,7 +554,6 @@ def focus5_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -590,4 +589,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_frame.py b/examples/elementary/test_frame.py
index 5aa979d..9e72692 100644
--- a/examples/elementary/test_frame.py
+++ b/examples/elementary/test_frame.py
@@ -59,9 +59,7 @@ def frame_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     frame_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_gengrid.py b/examples/elementary/test_gengrid.py
index c11bbec..4b2ee6d 100644
--- a/examples/elementary/test_gengrid.py
+++ b/examples/elementary/test_gengrid.py
@@ -380,9 +380,7 @@ def gengrid_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     gengrid_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_genlist.py b/examples/elementary/test_genlist.py
index bc9c907..8d0e913 100644
--- a/examples/elementary/test_genlist.py
+++ b/examples/elementary/test_genlist.py
@@ -797,7 +797,6 @@ def genlist11_clicked(obj, item=None):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -839,4 +838,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_gesture_layer.py b/examples/elementary/test_gesture_layer.py
index 15fd6e3..8c78d83 100644
--- a/examples/elementary/test_gesture_layer.py
+++ b/examples/elementary/test_gesture_layer.py
@@ -327,9 +327,7 @@ def gesture_layer_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     gesture_layer_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_grid.py b/examples/elementary/test_grid.py
index ac007d7..c3d5bce 100644
--- a/examples/elementary/test_grid.py
+++ b/examples/elementary/test_grid.py
@@ -77,9 +77,7 @@ def grid_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     grid_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_hover.py b/examples/elementary/test_hover.py
index 007cd6d..d4db83a 100644
--- a/examples/elementary/test_hover.py
+++ b/examples/elementary/test_hover.py
@@ -121,7 +121,6 @@ def hover2_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -154,4 +153,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_hoversel.py b/examples/elementary/test_hoversel.py
index 45a6739..9672c54 100644
--- a/examples/elementary/test_hoversel.py
+++ b/examples/elementary/test_hoversel.py
@@ -94,9 +94,7 @@ def hoversel_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     hoversel_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_icon.py b/examples/elementary/test_icon.py
index 3beed57..8503706 100644
--- a/examples/elementary/test_icon.py
+++ b/examples/elementary/test_icon.py
@@ -168,7 +168,6 @@ def icon_standard_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -202,4 +201,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_image.py b/examples/elementary/test_image.py
index ece1949..afdcce8 100644
--- a/examples/elementary/test_image.py
+++ b/examples/elementary/test_image.py
@@ -130,7 +130,6 @@ def image2_clicked(obj, it=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
                          size=(320, 520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -163,4 +162,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_index.py b/examples/elementary/test_index.py
index 076d525..9607bd4 100644
--- a/examples/elementary/test_index.py
+++ b/examples/elementary/test_index.py
@@ -93,9 +93,7 @@ def index_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     index_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_input_events.py b/examples/elementary/test_input_events.py
index e9b46e8..1b8df2a 100644
--- a/examples/elementary/test_input_events.py
+++ b/examples/elementary/test_input_events.py
@@ -91,10 +91,8 @@ def elm_input_events_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     elm_input_events_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_inwin.py b/examples/elementary/test_inwin.py
index 97ff71a..3d9f899 100644
--- a/examples/elementary/test_inwin.py
+++ b/examples/elementary/test_inwin.py
@@ -29,9 +29,7 @@ def inner_window_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     inner_window_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_label.py b/examples/elementary/test_label.py
index 58e6c7c..b6d950b 100644
--- a/examples/elementary/test_label.py
+++ b/examples/elementary/test_label.py
@@ -148,9 +148,7 @@ def label_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     label_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_layout.py b/examples/elementary/test_layout.py
index 2540c9d..84faa45 100644
--- a/examples/elementary/test_layout.py
+++ b/examples/elementary/test_layout.py
@@ -49,9 +49,7 @@ def layout_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     layout_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_list.py b/examples/elementary/test_list.py
index 4a089d3..3f0c89e 100644
--- a/examples/elementary/test_list.py
+++ b/examples/elementary/test_list.py
@@ -260,7 +260,6 @@ def list3_clicked(obj, item=None):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -294,4 +293,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_main_menu.py b/examples/elementary/test_main_menu.py
index 01628f5..f9893ae 100644
--- a/examples/elementary/test_main_menu.py
+++ b/examples/elementary/test_main_menu.py
@@ -47,10 +47,8 @@ def main_menu_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     main_menu_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_map.py b/examples/elementary/test_map.py
index f64e7e1..6c4ffa5 100644
--- a/examples/elementary/test_map.py
+++ b/examples/elementary/test_map.py
@@ -438,9 +438,7 @@ def map_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     map_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_mapbuf.py b/examples/elementary/test_mapbuf.py
index bce97ff..e0c1712 100644
--- a/examples/elementary/test_mapbuf.py
+++ b/examples/elementary/test_mapbuf.py
@@ -169,9 +169,7 @@ def mapbuf_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     mapbuf_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_menu.py b/examples/elementary/test_menu.py
index 94f43e6..f2b1a78 100644
--- a/examples/elementary/test_menu.py
+++ b/examples/elementary/test_menu.py
@@ -85,9 +85,7 @@ def menu_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     menu_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_multibuttonentry.py b/examples/elementary/test_multibuttonentry.py
index e57a6cd..b8ad5b6 100644
--- a/examples/elementary/test_multibuttonentry.py
+++ b/examples/elementary/test_multibuttonentry.py
@@ -180,10 +180,8 @@ def multibuttonentry_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     multibuttonentry_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_naviframe.py b/examples/elementary/test_naviframe.py
index 644f5af..9cfa75a 100644
--- a/examples/elementary/test_naviframe.py
+++ b/examples/elementary/test_naviframe.py
@@ -129,9 +129,7 @@ def naviframe_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     naviframe_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_notify.py b/examples/elementary/test_notify.py
index a62c2e2..a711324 100644
--- a/examples/elementary/test_notify.py
+++ b/examples/elementary/test_notify.py
@@ -320,9 +320,7 @@ def notify_clicked(obj=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     notify_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_panel.py b/examples/elementary/test_panel.py
index fa11896..ee5e656 100644
--- a/examples/elementary/test_panel.py
+++ b/examples/elementary/test_panel.py
@@ -94,10 +94,8 @@ def panel_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     panel_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_panel_scroll.py b/examples/elementary/test_panel_scroll.py
index 016e9a7..c4d0a79 100644
--- a/examples/elementary/test_panel_scroll.py
+++ b/examples/elementary/test_panel_scroll.py
@@ -60,10 +60,8 @@ def panel_scroll_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     panel_scroll_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_panes.py b/examples/elementary/test_panes.py
index b28dfc7..6df91e5 100644
--- a/examples/elementary/test_panes.py
+++ b/examples/elementary/test_panes.py
@@ -47,9 +47,7 @@ def panes_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     panes_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_photo.py b/examples/elementary/test_photo.py
index 790bbb2..553b23a 100644
--- a/examples/elementary/test_photo.py
+++ b/examples/elementary/test_photo.py
@@ -62,9 +62,7 @@ def photo_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     photo_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_photocam.py b/examples/elementary/test_photocam.py
index 1eac672..7903e75 100644
--- a/examples/elementary/test_photocam.py
+++ b/examples/elementary/test_photocam.py
@@ -152,9 +152,7 @@ def photocam_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     photocam_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_popup.py b/examples/elementary/test_popup.py
index f495e55..a00e5f4 100644
--- a/examples/elementary/test_popup.py
+++ b/examples/elementary/test_popup.py
@@ -203,9 +203,7 @@ def popup_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     popup_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_progressbar.py b/examples/elementary/test_progressbar.py
index f41a1de..cee68e8 100644
--- a/examples/elementary/test_progressbar.py
+++ b/examples/elementary/test_progressbar.py
@@ -151,9 +151,7 @@ def progressbar_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     progressbar_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_radio.py b/examples/elementary/test_radio.py
index ebf07eb..5c93025 100644
--- a/examples/elementary/test_radio.py
+++ b/examples/elementary/test_radio.py
@@ -73,9 +73,7 @@ def radio_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     radio_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_scroller.py b/examples/elementary/test_scroller.py
index 1b01763..6178a79 100644
--- a/examples/elementary/test_scroller.py
+++ b/examples/elementary/test_scroller.py
@@ -183,9 +183,7 @@ def scroller_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     scroller_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_segment_control.py b/examples/elementary/test_segment_control.py
index 97adb61..95b86ea 100644
--- a/examples/elementary/test_segment_control.py
+++ b/examples/elementary/test_segment_control.py
@@ -94,9 +94,7 @@ def segment_control_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     segment_control_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_separator.py b/examples/elementary/test_separator.py
index 9871b82..cf52e67 100644
--- a/examples/elementary/test_separator.py
+++ b/examples/elementary/test_separator.py
@@ -58,9 +58,7 @@ def separator_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     separator_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_slider.py b/examples/elementary/test_slider.py
index c69e44d..a3d159a 100644
--- a/examples/elementary/test_slider.py
+++ b/examples/elementary/test_slider.py
@@ -245,10 +245,8 @@ def slider_clicked(obj):
     rd.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     slider_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_slideshow.py b/examples/elementary/test_slideshow.py
index a3c6a44..3f06bd6 100644
--- a/examples/elementary/test_slideshow.py
+++ b/examples/elementary/test_slideshow.py
@@ -74,40 +74,45 @@ def spin(sp, ss):
     if (ss.timeout > 0):
         ss.timeout = sp.value
 
-def slide_transition(ss, slide_it, slide_last_it):
-    if (slide_last_it == slide_it):
+
+def ss_changed_cb(ss, item):
+    print("CHANGED", item)
+
+def ss_transition_end_cb(ss, item, last_item):
+    print("TRANSITION END", item)
+    if item == last_item:
         print("Reaches to End of slides\n")
 
 class ssClass(SlideshowItemClass):
-    def get(self, obj, *args, **kwargs):
-        photo = Photo(obj, file=args[0], fill_inside=True, style="shadow")
+    def get(self, obj, item_data):
+        print("Class get", item_data)
+        photo = Photo(obj, file=item_data, fill_inside=True, style="shadow")
         return photo
 
+    def delete(self, obj, item_data):
+        print("Class delete", item_data)
+
 def slideshow_clicked(obj):
-    win = StandardWindow("slideshow", "Slideshow", autodel=True,
-        size=(500, 400))
+    win = StandardWindow("slideshow", "Slideshow",
+                         autodel=True, size=(500, 400))
 
     ss = Slideshow(win, loop=True, size_hint_weight=EXPAND_BOTH)
     win.resize_object_add(ss)
     ss.show()
 
     ssc = ssClass()
-    ss.item_add(ssc, os.path.join(img_path, images[0]))
-    ss.item_add(ssc, os.path.join(img_path, images[1]))
-    ss.item_add(ssc, os.path.join(img_path, images[2]))
-    ss.item_add(ssc, os.path.join(img_path, images[3]))
-    ss.item_add(ssc, os.path.join(img_path, images[8]))
-    ss.item_add(ssc, os.path.join(img_path, images[4]))
-    ss.item_add(ssc, os.path.join(img_path, images[5]))
-    ss.item_add(ssc, os.path.join(img_path, images[6]))
-    slide_last_it = ss.item_add(ssc, os.path.join(img_path, images[7]))
-    ss.callback_transition_end_add(slide_transition, slide_last_it)
+    for i in range(len(images)):
+        print("ADD", images[i])
+        slide_last_it = ss.item_add(ssc, os.path.join(img_path, images[i]))
+
+    ss.callback_changed_add(ss_changed_cb)
+    ss.callback_transition_end_add(ss_transition_end_cb, slide_last_it)
 
     bx = Box(win, horizontal=True)
     bx.show()
 
-    no = Notify(win, align=(0.5, 1.0),
-        size_hint_weight=EXPAND_BOTH, timeout=3.0, content=bx)
+    no = Notify(win, align=(0.5, 1.0), timeout=3.0, content=bx,
+                size_hint_weight=EXPAND_BOTH)
     win.resize_object_add(no)
 
     bx.event_callback_add(EVAS_CALLBACK_MOUSE_IN, mouse_in, no)
@@ -136,8 +141,8 @@ def slideshow_clicked(obj):
          hv.item_add(layout, None, 0, layout_select, ss, layout)
     hv.show()
 
-    sp = Spinner(win, label_format="%2.0f secs.", step=1, min_max=(1, 30),
-        value=3)
+    sp = Spinner(win, label_format="%2.0f secs.",
+                 step=1, min_max=(1, 30), value=3)
     sp.callback_changed_add(spin, ss)
     bx.pack_end(sp)
     sp.show()
@@ -160,9 +165,7 @@ def slideshow_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     slideshow_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_spinner.py b/examples/elementary/test_spinner.py
index e1ca38f..6b9457a 100644
--- a/examples/elementary/test_spinner.py
+++ b/examples/elementary/test_spinner.py
@@ -72,9 +72,7 @@ def spinner_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     spinner_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_store.py b/examples/elementary/test_store.py
index 303d1bb..4a2f8d4 100644
--- a/examples/elementary/test_store.py
+++ b/examples/elementary/test_store.py
@@ -126,9 +126,7 @@ def store_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     store_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_sys_notify.py b/examples/elementary/test_sys_notify.py
index 86fd005..4a8672b 100644
--- a/examples/elementary/test_sys_notify.py
+++ b/examples/elementary/test_sys_notify.py
@@ -80,9 +80,7 @@ def sys_notify_clicked(obj):
     win.show()
 
 if __name__ == "__main__":
-    elementary.init()
 
     sys_notify_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_table.py b/examples/elementary/test_table.py
index b4a8e67..8ffa551 100644
--- a/examples/elementary/test_table.py
+++ b/examples/elementary/test_table.py
@@ -291,7 +291,6 @@ def table7_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -331,4 +330,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_theme.py b/examples/elementary/test_theme.py
index b21e4c7..d35754d 100644
--- a/examples/elementary/test_theme.py
+++ b/examples/elementary/test_theme.py
@@ -88,10 +88,8 @@ def theme_clicked(obj, data=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     theme_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_thumb.py b/examples/elementary/test_thumb.py
index 74c74b9..3cf845e 100644
--- a/examples/elementary/test_thumb.py
+++ b/examples/elementary/test_thumb.py
@@ -59,9 +59,7 @@ def thumb_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     thumb_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_toolbar.py b/examples/elementary/test_toolbar.py
index d71d819..932d8ad 100644
--- a/examples/elementary/test_toolbar.py
+++ b/examples/elementary/test_toolbar.py
@@ -46,9 +46,10 @@ def tb_4a(obj, it, ph):
 def tb_5(obj, it, ph):
     ph.file = None
 
-def cb_clicked(tb):
+def cb_clicked(tb, it):
     print("CLICKED")
     print(tb)
+    print(it)
 
 def cb_item_focused(tb, item):
     print("ITEM FOCUSED")
@@ -205,7 +206,6 @@ def toolbar5_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -240,4 +240,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_tooltip.py b/examples/elementary/test_tooltip.py
index 4e38003..43e00ec 100644
--- a/examples/elementary/test_tooltip.py
+++ b/examples/elementary/test_tooltip.py
@@ -222,9 +222,7 @@ def tooltip_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     tooltip_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_transit.py b/examples/elementary/test_transit.py
index 86709d7..18e4391 100644
--- a/examples/elementary/test_transit.py
+++ b/examples/elementary/test_transit.py
@@ -362,7 +362,6 @@ def transit9_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     win = StandardWindow("test", "python-elementary test application",
         size=(320,520))
     win.callback_delete_request_add(lambda o: elementary.exit())
@@ -404,4 +403,3 @@ if __name__ == "__main__":
 
     win.show()
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_transit_bezier.py b/examples/elementary/test_transit_bezier.py
index 4c37d04..b1cdf24 100644
--- a/examples/elementary/test_transit_bezier.py
+++ b/examples/elementary/test_transit_bezier.py
@@ -156,7 +156,5 @@ def transit_bezier_clicked(obj, item=None):
 
 
 if __name__ == "__main__":
-    elementary.init()
     transit_bezier_clicked(None)
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_video.py b/examples/elementary/test_video.py
index 20bdab3..d84d617 100644
--- a/examples/elementary/test_video.py
+++ b/examples/elementary/test_video.py
@@ -43,9 +43,7 @@ def video_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     video_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_web.py b/examples/elementary/test_web.py
index 2c1bcff..ac848ac 100644
--- a/examples/elementary/test_web.py
+++ b/examples/elementary/test_web.py
@@ -146,9 +146,7 @@ def web_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
     if not elementary.need_web():
-        elementary.shutdown()
         raise SystemExit("EFL-webkit not available!")
 
     elementary.policy_set(elementary.ELM_POLICY_QUIT,
@@ -157,4 +155,3 @@ if __name__ == "__main__":
     web_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
diff --git a/examples/elementary/test_win.py b/examples/elementary/test_win.py
index ad87b3c..89396f7 100644
--- a/examples/elementary/test_win.py
+++ b/examples/elementary/test_win.py
@@ -149,10 +149,8 @@ def window_states_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     window_states_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/elementary/test_win_dialog.py b/examples/elementary/test_win_dialog.py
index 42b4356..122bd18 100644
--- a/examples/elementary/test_win_dialog.py
+++ b/examples/elementary/test_win_dialog.py
@@ -39,10 +39,8 @@ def window_dialog_clicked(obj):
 
 
 if __name__ == "__main__":
-    elementary.init()
 
     window_dialog_clicked(None)
 
     elementary.run()
-    elementary.shutdown()
 
diff --git a/examples/emotion/test_emotion.py b/examples/emotion/test_emotion.py
index 54d8cde..21ca635 100755
--- a/examples/emotion/test_emotion.py
+++ b/examples/emotion/test_emotion.py
@@ -48,7 +48,7 @@ class MovieWindow(edje.Edje):
         self.part_text_set("video_alpha_txt", "alpha 255")
         self.part_drag_value_set("video_volume", 0.0, 0.5)
         self.part_text_set("video_volume_txt", "vol 0.50")
-        
+
         self.part_swallow("video_swallow", self.vid)
         self.data["moving"] = False
         self.data["resizing"] = False
@@ -365,8 +365,6 @@ def cmdline_parse():
 if __name__ == "__main__"or True:
     options, args = cmdline_parse()
 
-    elementary.init()
-
     # elementary window
     win = Window("test-emotion", ELM_WIN_BASIC)
     win.title_set("python-emotion test application")
@@ -414,9 +412,3 @@ if __name__ == "__main__"or True:
     del win.data["movie_windows"]
     win.delete()
     del scene
-    
-
-    elementary.shutdown()
-    emotion.shutdown()
-    edje.shutdown()
-    evas.shutdown()
diff --git a/tests/dbus/test_01_basics.py b/tests/dbus/test_01_basics.py
index 20e2944..183f5a9 100644
--- a/tests/dbus/test_01_basics.py
+++ b/tests/dbus/test_01_basics.py
@@ -40,4 +40,3 @@ class TestDBusBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_01_timer.py b/tests/ecore/test_01_timer.py
index 8d48a34..3a3609d 100644
--- a/tests/ecore/test_01_timer.py
+++ b/tests/ecore/test_01_timer.py
@@ -39,7 +39,7 @@ class TestTimer(unittest.TestCase):
 
         self.assertEqual(before1, after1)
         self.assertEqual(before2, after2)
-        self.assertNotEqual(before3, after3) # already deleted 
+        self.assertNotEqual(before3, after3) # already deleted
         self.assertNotEqual(before4, after4) # already deleted
 
         self.assertEqual(t1.is_deleted(), False)
@@ -57,4 +57,3 @@ class TestTimer(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_02_animator.py b/tests/ecore/test_02_animator.py
index 102cffe..1542d04 100644
--- a/tests/ecore/test_02_animator.py
+++ b/tests/ecore/test_02_animator.py
@@ -52,4 +52,3 @@ class TestAnimator(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_03_poller.py b/tests/ecore/test_03_poller.py
index 12a243b..91e5d50 100644
--- a/tests/ecore/test_03_poller.py
+++ b/tests/ecore/test_03_poller.py
@@ -22,7 +22,7 @@ def poller_cb2(one, two, three, test):
 
 class TestPoller(unittest.TestCase):
     def testInit(self):
-        
+
         p1 = ecore.Poller(4, poller_cb)
         p2 = ecore.Poller(2, poller_cb2, ecore.ECORE_POLLER_CORE,
                           "uno", "due", three="tre", test=self)
@@ -41,4 +41,3 @@ class TestPoller(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_04_idler.py b/tests/ecore/test_04_idler.py
index 895516e..711cd52 100644
--- a/tests/ecore/test_04_idler.py
+++ b/tests/ecore/test_04_idler.py
@@ -20,7 +20,7 @@ class TestIdler(unittest.TestCase):
 
         self.assertIsInstance(i1, ecore.Idler)
         self.assertIsInstance(i2, ecore.Idler)
-        
+
         before1 = i1.__repr__()
         before2 = i2.__repr__()
 
@@ -36,8 +36,8 @@ class TestIdler(unittest.TestCase):
         self.assertEqual(t.is_deleted(), True)
         self.assertEqual(i1.is_deleted(), False)
         self.assertEqual(i2.is_deleted(), True)
-        
-        
+
+
         i1.delete()
         del t
         del i1
@@ -46,4 +46,3 @@ class TestIdler(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_05_idle_enterer.py b/tests/ecore/test_05_idle_enterer.py
index fce9624..0c0037a 100644
--- a/tests/ecore/test_05_idle_enterer.py
+++ b/tests/ecore/test_05_idle_enterer.py
@@ -63,4 +63,3 @@ class TestIdleEnterer(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_06_idle_exiter.py b/tests/ecore/test_06_idle_exiter.py
index bab08fa..61ddfaa 100644
--- a/tests/ecore/test_06_idle_exiter.py
+++ b/tests/ecore/test_06_idle_exiter.py
@@ -51,7 +51,7 @@ class TestIdleExiter(unittest.TestCase):
         self.assertEqual(t.is_deleted(), True)
         self.assertEqual(i1.is_deleted(), False)
         self.assertEqual(i2.is_deleted(), True)
-        
+
         i1.delete()
         del i1
         del i2 # already deleted since returned false
@@ -62,4 +62,3 @@ class TestIdleExiter(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_07_fd_handler.py b/tests/ecore/test_07_fd_handler.py
index 3159998..3d4b103 100644
--- a/tests/ecore/test_07_fd_handler.py
+++ b/tests/ecore/test_07_fd_handler.py
@@ -37,4 +37,3 @@ class TestFdHandler(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_08_exe.py b/tests/ecore/test_08_exe.py
index 8aff8e8..bde2571 100644
--- a/tests/ecore/test_08_exe.py
+++ b/tests/ecore/test_08_exe.py
@@ -84,5 +84,3 @@ class TestExe(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
-
diff --git a/tests/ecore/test_09_file_download.py b/tests/ecore/test_09_file_download.py
index 65cec70..83c2927 100644
--- a/tests/ecore/test_09_file_download.py
+++ b/tests/ecore/test_09_file_download.py
@@ -26,11 +26,10 @@ class TestFileDownload(unittest.TestCase):
         ecore.FileDownload("http://www.google.com", dst,
                             completion_cb = _completion_cb,
                             progress_cb = _progress_cb)
-        
+
         ecore.main_loop_begin()
-        
+
 
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/ecore/test_10_file_monitor.py b/tests/ecore/test_10_file_monitor.py
index 9d3519e..162e322 100644
--- a/tests/ecore/test_10_file_monitor.py
+++ b/tests/ecore/test_10_file_monitor.py
@@ -82,4 +82,3 @@ class TestFileMonitor(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    ecore.shutdown()
diff --git a/tests/edje/TODO-edit/01-edje.py b/tests/edje/TODO-edit/01-edje.py
index 3b9bffd..6203c5e 100644
--- a/tests/edje/TODO-edit/01-edje.py
+++ b/tests/edje/TODO-edit/01-edje.py
@@ -239,6 +239,3 @@ class Basics(unittest.TestCase):
 edje.file_cache_set(0)
 suite = unittest.TestLoader().loadTestsFromTestCase(Basics)
 unittest.TextTestRunner(verbosity=2).run(suite)
-edje.shutdown()
-ecore.evas.shutdown()
-
diff --git a/tests/edje/TODO-edit/02-group.py b/tests/edje/TODO-edit/02-group.py
index 5e7a0f8..c85a204 100644
--- a/tests/edje/TODO-edit/02-group.py
+++ b/tests/edje/TODO-edit/02-group.py
@@ -58,5 +58,3 @@ class Basics(unittest.TestCase):
 edje.file_cache_set(0)
 suite = unittest.TestLoader().loadTestsFromTestCase(Basics)
 unittest.TextTestRunner(verbosity=2).run(suite)
-edje.shutdown()
-ecore.evas.shutdown()
diff --git a/tests/edje/TODO-edit/03-parts.py b/tests/edje/TODO-edit/03-parts.py
index 72d837e..cad0b81 100644
--- a/tests/edje/TODO-edit/03-parts.py
+++ b/tests/edje/TODO-edit/03-parts.py
@@ -91,5 +91,3 @@ class Basics(unittest.TestCase):
 edje.file_cache_set(0)
 suite = unittest.TestLoader().loadTestsFromTestCase(Basics)
 unittest.TextTestRunner(verbosity=2).run(suite)
-edje.shutdown()
-ecore.evas.shutdown()
diff --git a/tests/edje/TODO-edit/04-states.py b/tests/edje/TODO-edit/04-states.py
index 270a598..ecae53e 100644
--- a/tests/edje/TODO-edit/04-states.py
+++ b/tests/edje/TODO-edit/04-states.py
@@ -68,5 +68,3 @@ class Basics(unittest.TestCase):
 edje.file_cache_set(0)
 suite = unittest.TestLoader().loadTestsFromTestCase(Basics)
 unittest.TextTestRunner(verbosity=2).run(suite)
-edje.shutdown()
-ecore.evas.shutdown()
diff --git a/tests/edje/test_01_basics.py b/tests/edje/test_01_basics.py
index c639b0a..b015383 100644
--- a/tests/edje/test_01_basics.py
+++ b/tests/edje/test_01_basics.py
@@ -72,4 +72,3 @@ class TestBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    edje.shutdown()
diff --git a/tests/edje/test_02_object.py b/tests/edje/test_02_object.py
index 98fe086..0650d84 100644
--- a/tests/edje/test_02_object.py
+++ b/tests/edje/test_02_object.py
@@ -124,6 +124,3 @@ class TestEdjeObject(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    edje.shutdown()
-    ecore.shutdown()
-    evas.shutdown()
diff --git a/tests/edje/test_03_external.py b/tests/edje/test_03_external.py
index ef164f5..ad52bb7 100644
--- a/tests/edje/test_03_external.py
+++ b/tests/edje/test_03_external.py
@@ -3,7 +3,6 @@
 import os, unittest
 
 from efl import evas
-from efl import ecore
 from efl import edje
 
 from efl.elementary.actionslider import Actionslider
@@ -370,8 +369,3 @@ class TestElementaryExternal(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-
-    elementary.shutdown()
-    edje.shutdown()
-    ecore.shutdown()
-    evas.shutdown()
diff --git a/tests/edje/test_04_edit.py b/tests/edje/test_04_edit.py
index a558216..95e49bc 100644
--- a/tests/edje/test_04_edit.py
+++ b/tests/edje/test_04_edit.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
 from efl import evas
-from efl import ecore
-from efl import edje
 from efl.edje import EDJE_PART_TYPE_RECTANGLE
 from efl.edje_edit import EdjeEdit, Text_Style, Text_Style_Tag, Color_Class, \
                           Part, Program
@@ -482,7 +480,3 @@ class TestEdjeEditPartStates(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    edje.shutdown()
-    ecore.shutdown()
-    evas.shutdown()
-
diff --git a/tests/edje/test_05_decorators.py b/tests/edje/test_05_decorators.py
index 1b7d8b3..ae27a10 100644
--- a/tests/edje/test_05_decorators.py
+++ b/tests/edje/test_05_decorators.py
@@ -80,6 +80,3 @@ class TestEdjeDecoratedCallbacks(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    edje.shutdown()
-    ecore.shutdown()
-    evas.shutdown()
diff --git a/tests/elementary/test_01_basics.py b/tests/elementary/test_01_basics.py
index a24c4fe..9ad3a6d 100644
--- a/tests/elementary/test_01_basics.py
+++ b/tests/elementary/test_01_basics.py
@@ -7,7 +7,6 @@ from efl import elementary
 from efl.elementary.window import Window, ELM_WIN_BASIC
 from efl.elementary.button import Button
 
-elementary.init()
 
 def cb1(*args):
     pass
@@ -54,4 +53,3 @@ class TestElmBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    elementary.shutdown()
diff --git a/tests/elementary/test_02_image_icon.py b/tests/elementary/test_02_image_icon.py
index 36d194c..dbb21b0 100644
--- a/tests/elementary/test_02_image_icon.py
+++ b/tests/elementary/test_02_image_icon.py
@@ -13,7 +13,6 @@ from efl.elementary.icon import Icon
 script_path = os.path.dirname(os.path.abspath(__file__))
 img_path = os.path.join(script_path, "images")
 
-elementary.init()
 
 class TestElmImage(unittest.TestCase):
 
@@ -95,4 +94,3 @@ class TestElmIcon(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    elementary.shutdown()
diff --git a/tests/elementary/test_03_entry.py b/tests/elementary/test_03_entry.py
index 2b6bf1f..381e086 100644
--- a/tests/elementary/test_03_entry.py
+++ b/tests/elementary/test_03_entry.py
@@ -8,7 +8,6 @@ from efl import elementary
 from efl.elementary.window import Window, ELM_WIN_BASIC
 from efl.elementary.entry import Entry
 
-elementary.init()
 
 class TestElmBasics(unittest.TestCase):
 
@@ -27,4 +26,3 @@ class TestElmBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    elementary.shutdown()
diff --git a/tests/eo/test_01_basics.py b/tests/eo/test_01_basics.py
index a26ffe2..d45fe2c 100644
--- a/tests/eo/test_01_basics.py
+++ b/tests/eo/test_01_basics.py
@@ -23,4 +23,3 @@ class TestBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    eo.shutdown()
diff --git a/tests/evas/test_01_rect.py b/tests/evas/test_01_rect.py
index 3e5d3c2..281a043 100644
--- a/tests/evas/test_01_rect.py
+++ b/tests/evas/test_01_rect.py
@@ -368,4 +368,3 @@ class TestRectClamp(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_02_canvas.py b/tests/evas/test_02_canvas.py
index a9b236b..9c026bf 100644
--- a/tests/evas/test_02_canvas.py
+++ b/tests/evas/test_02_canvas.py
@@ -74,7 +74,7 @@ class TestCanvasProperties(unittest.TestCase):
 
 
 class TestCanvasDeletion(unittest.TestCase):
-    def testEmptyCanvasDelete(self):  
+    def testEmptyCanvasDelete(self):
         canvas = _new_canvas()
         canvas.delete()
 
@@ -100,12 +100,12 @@ class TestCanvasFactory(unittest.TestCase):
     def tearDown(self):
         self.canvas.delete()
 
-    def testRectangle(self):  
+    def testRectangle(self):
         o = self.canvas.Rectangle()
         self.assertEqual(type(o), evas.Rectangle)
         o.delete()
 
-    def testImage(self):  
+    def testImage(self):
         o = self.canvas.Image()
         self.assertEqual(type(o), evas.Image)
         o.delete()
@@ -133,5 +133,3 @@ class TestCanvasFactory(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
-
diff --git a/tests/evas/test_03_object.py b/tests/evas/test_03_object.py
index e350f4d..3a5c8d9 100644
--- a/tests/evas/test_03_object.py
+++ b/tests/evas/test_03_object.py
@@ -195,4 +195,3 @@ class TestObjectProperties(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_04_object_box.py b/tests/evas/test_04_object_box.py
index c07e764..5062258 100644
--- a/tests/evas/test_04_object_box.py
+++ b/tests/evas/test_04_object_box.py
@@ -54,4 +54,3 @@ class TestBoxBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_05_object_image.py b/tests/evas/test_05_object_image.py
index 4a11d07..8f74ed8 100644
--- a/tests/evas/test_05_object_image.py
+++ b/tests/evas/test_05_object_image.py
@@ -27,4 +27,3 @@ class TestImageBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_06_object_smart.py b/tests/evas/test_06_object_smart.py
index 2a15ba8..8e13180 100644
--- a/tests/evas/test_06_object_smart.py
+++ b/tests/evas/test_06_object_smart.py
@@ -144,4 +144,3 @@ class SmartObjectTest(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_07_object_line.py b/tests/evas/test_07_object_line.py
index ce960b4..b06988c 100644
--- a/tests/evas/test_07_object_line.py
+++ b/tests/evas/test_07_object_line.py
@@ -24,4 +24,3 @@ class TestLineBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_08_object_polygon.py b/tests/evas/test_08_object_polygon.py
index b38a913..b24e8e4 100644
--- a/tests/evas/test_08_object_polygon.py
+++ b/tests/evas/test_08_object_polygon.py
@@ -23,4 +23,3 @@ class TestPolygonBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_09_object_text.py b/tests/evas/test_09_object_text.py
index 824d20e..32d599f 100644
--- a/tests/evas/test_09_object_text.py
+++ b/tests/evas/test_09_object_text.py
@@ -23,4 +23,3 @@ class TestTextBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_10_object_textblock.py b/tests/evas/test_10_object_textblock.py
index 8e12f12..0469c9b 100644
--- a/tests/evas/test_10_object_textblock.py
+++ b/tests/evas/test_10_object_textblock.py
@@ -23,4 +23,3 @@ class TestTextblockBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()
diff --git a/tests/evas/test_11_object_textgrid.py b/tests/evas/test_11_object_textgrid.py
index 9a9d6d8..b668639 100644
--- a/tests/evas/test_11_object_textgrid.py
+++ b/tests/evas/test_11_object_textgrid.py
@@ -38,4 +38,3 @@ class TestTextgridBasics(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-    evas.shutdown()