davemds pushed a commit to branch master.
commit 2b7a9c7030011be8a36c89cfcc067869494c7e31
Author: davemds <[email protected]>
Date: Wed May 1 23:13:26 2013 +0200
Python-EFL: follow the eldbus rename.
---
efl/{edbus => eldbus}/connection.pxi | 0
efl/{edbus/edbus.pxd => eldbus/eldbus.pxd} | 0
efl/{edbus/edbus.pyx => eldbus/eldbus.pyx} | 0
efl/{edbus => eldbus}/enums.pxd | 0
efl/{edbus => eldbus}/freedesktop.pxi | 0
efl/{edbus => eldbus}/message.pxi | 0
efl/{edbus => eldbus}/object.pxi | 0
efl/{edbus => eldbus}/pending.pxi | 0
efl/{edbus => eldbus}/proxy.pxi | 0
efl/{edbus => eldbus}/service.pxi | 0
efl/{edbus => eldbus}/signal_handler.pxi | 0
efl/elementary/__init__.py | 2 +-
efl/elementary/need.pxd | 2 +-
efl/elementary/need.pyx | 10 +++++-----
setup.py | 16 ++++++++--------
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/efl/edbus/connection.pxi b/efl/eldbus/connection.pxi
similarity index 100%
rename from efl/edbus/connection.pxi
rename to efl/eldbus/connection.pxi
diff --git a/efl/edbus/edbus.pxd b/efl/eldbus/eldbus.pxd
similarity index 100%
rename from efl/edbus/edbus.pxd
rename to efl/eldbus/eldbus.pxd
diff --git a/efl/edbus/edbus.pyx b/efl/eldbus/eldbus.pyx
similarity index 100%
rename from efl/edbus/edbus.pyx
rename to efl/eldbus/eldbus.pyx
diff --git a/efl/edbus/enums.pxd b/efl/eldbus/enums.pxd
similarity index 100%
rename from efl/edbus/enums.pxd
rename to efl/eldbus/enums.pxd
diff --git a/efl/edbus/freedesktop.pxi b/efl/eldbus/freedesktop.pxi
similarity index 100%
rename from efl/edbus/freedesktop.pxi
rename to efl/eldbus/freedesktop.pxi
diff --git a/efl/edbus/message.pxi b/efl/eldbus/message.pxi
similarity index 100%
rename from efl/edbus/message.pxi
rename to efl/eldbus/message.pxi
diff --git a/efl/edbus/object.pxi b/efl/eldbus/object.pxi
similarity index 100%
rename from efl/edbus/object.pxi
rename to efl/eldbus/object.pxi
diff --git a/efl/edbus/pending.pxi b/efl/eldbus/pending.pxi
similarity index 100%
rename from efl/edbus/pending.pxi
rename to efl/eldbus/pending.pxi
diff --git a/efl/edbus/proxy.pxi b/efl/eldbus/proxy.pxi
similarity index 100%
rename from efl/edbus/proxy.pxi
rename to efl/eldbus/proxy.pxi
diff --git a/efl/edbus/service.pxi b/efl/eldbus/service.pxi
similarity index 100%
rename from efl/edbus/service.pxi
rename to efl/eldbus/service.pxi
diff --git a/efl/edbus/signal_handler.pxi b/efl/eldbus/signal_handler.pxi
similarity index 100%
rename from efl/edbus/signal_handler.pxi
rename to efl/eldbus/signal_handler.pxi
diff --git a/efl/elementary/__init__.py b/efl/elementary/__init__.py
index 1a16392..7aa19ce 100644
--- a/efl/elementary/__init__.py
+++ b/efl/elementary/__init__.py
@@ -55,7 +55,7 @@ from efl.elementary.need import \
need_systray, \
need_sys_notify, \
need_e_dbus, \
- need_edbus, \
+ need_eldbus, \
need_elocation, \
need_ethumb, \
need_web
diff --git a/efl/elementary/need.pxd b/efl/elementary/need.pxd
index 1f737d7..555be87 100644
--- a/efl/elementary/need.pxd
+++ b/efl/elementary/need.pxd
@@ -4,7 +4,7 @@ cdef extern from "Elementary.h":
Eina_Bool elm_need_efreet()
Eina_Bool elm_need_systray()
Eina_Bool elm_need_sys_notify()
- Eina_Bool elm_need_edbus()
+ Eina_Bool elm_need_eldbus()
Eina_Bool elm_need_elocation()
Eina_Bool elm_need_ethumb()
Eina_Bool elm_need_web()
diff --git a/efl/elementary/need.pyx b/efl/elementary/need.pyx
index 53dfbfa..5a2669d 100644
--- a/efl/elementary/need.pyx
+++ b/efl/elementary/need.pyx
@@ -79,12 +79,12 @@ def need_e_dbus():
"""
print("need_e_dbus() is deprecated. Use need_edbus instead.")
- return bool(elm_need_edbus())
+ return bool(elm_need_eldbus())
-def need_edbus():
- """need_edbus() -> bool
+def need_eldbus():
+ """need_eldbus() -> bool
- Request that your elementary application needs edbus
+ Request that your elementary application needs eldbus
This initializes the edbus (aka v2) library when called and if
support exists it returns True, otherwise returns
@@ -94,7 +94,7 @@ def need_edbus():
:rtype: bool
"""
- return bool(elm_need_edbus())
+ return bool(elm_need_eldbus())
def need_elocation():
"""need_elocation() -> bool
diff --git a/setup.py b/setup.py
index 80976b3..2d84e8a 100755
--- a/setup.py
+++ b/setup.py
@@ -126,14 +126,14 @@ else:
extra_link_args = emotion_libs + eina_libs +
evas_libs)
modules.append(emotion_ext)
- # EDBus
- #edbus_cflags, edbus_libs = pkg_config('EDBus', 'edbus2', "1.7.99")
- #pydbus_cflags, pydbus_libs = pkg_config('dbus-python', 'dbus-python')
- #edbus_ext = Extension("efl.edbus", ["efl/edbus/edbus.pyx"],
- #include_dirs = ['include/'],
- #extra_compile_args = edbus_cflags + pydbus_cflags
+ ecore_cflags,
- #extra_link_args = edbus_libs)
- #modules.append(edbus_ext)
+ # Eldbus
+ # eldbus_cflags, eldbus_libs = pkg_config('Eldbus', 'eldbus', "1.7.99")
+ # pydbus_cflags, pydbus_libs = pkg_config('dbus-python', 'dbus-python')
+ # eldbus_ext = Extension("efl.eldbus", ["efl/eldbus/eldbus.pyx"],
+ # include_dirs = ['include/'],
+ # extra_compile_args = eldbus_cflags +
pydbus_cflags + ecore_cflags,
+ # extra_link_args = eldbus_libs)
+ # modules.append(eldbus_ext)
# dbus mainloop integration
dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0")
--
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
