summaryrefslogtreecommitdiff
path: root/efl
diff options
context:
space:
mode:
authordavemds <dave@gurumeditation.it>2014-08-23 21:15:46 +0200
committerdavemds <dave@gurumeditation.it>2014-08-23 21:15:46 +0200
commitd3794d9566330ef8d00006f476b90fc90bcef0a2 (patch)
treef497cbf46bfa9b41f9192f9279b5c2ad35e5e8f0 /efl
parent3544e7408f7675b5c0618f4e43b725fc592f1978 (diff)
No need to call ecore init/shutodown here
they are called in e_dbus_init/shutdown
Diffstat (limited to 'efl')
-rw-r--r--efl/dbus_mainloop/dbus_mainloop.pxd4
-rw-r--r--efl/dbus_mainloop/dbus_mainloop.pyx2
2 files changed, 0 insertions, 6 deletions
diff --git a/efl/dbus_mainloop/dbus_mainloop.pxd b/efl/dbus_mainloop/dbus_mainloop.pxd
index 78f73ce..d16562c 100644
--- a/efl/dbus_mainloop/dbus_mainloop.pxd
+++ b/efl/dbus_mainloop/dbus_mainloop.pxd
@@ -12,10 +12,6 @@ cdef extern from "dbus/dbus-python.h":
12 PyObject *DBusPyNativeMainLoop_New4(_dbus_py_conn_setup_func conn_func, _dbus_py_srv_setup_func srv_func, _dbus_py_free_func free_func, void *) 12 PyObject *DBusPyNativeMainLoop_New4(_dbus_py_conn_setup_func conn_func, _dbus_py_srv_setup_func srv_func, _dbus_py_free_func free_func, void *)
13 int import_dbus_bindings(const char *this_module_name) 13 int import_dbus_bindings(const char *this_module_name)
14 14
15cdef extern from "Ecore.h":
16 int ecore_init()
17 void ecore_shutdown()
18
19cdef extern from "e_dbus.h": 15cdef extern from "e_dbus.h":
20 ctypedef struct E_DBus_Connection 16 ctypedef struct E_DBus_Connection
21 17
diff --git a/efl/dbus_mainloop/dbus_mainloop.pyx b/efl/dbus_mainloop/dbus_mainloop.pyx
index 68ddfdb..d2fb42b 100644
--- a/efl/dbus_mainloop/dbus_mainloop.pyx
+++ b/efl/dbus_mainloop/dbus_mainloop.pyx
@@ -46,12 +46,10 @@ def DBusEcoreMainLoop(set_as_default = None):
46 46
47def module_cleanup(): 47def module_cleanup():
48 e_dbus_shutdown() 48 e_dbus_shutdown()
49 ecore_shutdown()
50 49
51if import_dbus_bindings("efl.dbus_mainloop") < 0: 50if import_dbus_bindings("efl.dbus_mainloop") < 0:
52 raise ImportError("failed to import D-Bus bindings") 51 raise ImportError("failed to import D-Bus bindings")
53 52
54ecore_init()
55e_dbus_init() 53e_dbus_init()
56 54
57atexit.register(module_cleanup) 55atexit.register(module_cleanup)