diff options
| author | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2014-07-07 19:21:57 +0200 |
|---|---|---|
| committer | Cedric BAIL <c.bail@partner.samsung.com> | 2014-07-07 19:38:05 +0200 |
| commit | c2a9cd725b8269f4d601e3ad83c0b2657c4c9d44 (patch) | |
| tree | 59e7e60b9df86d1d41ecc941b3ff161666c199f1 | |
| parent | e1a5af2e3b9001eb00563f0eb219c28a538167ba (diff) | |
| download | elementary-c2a9cd725b8269f4d601e3ad83c0b2657c4c9d44.tar.gz | |
edbus: fix dlopening of the right library.
Summary:
Change-Id: I94e3d39286df830ef07ed2bda0ec87fce34cec4a
Bug: T1354
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
hotfix: look for versionned edbus lib
Without EFL application linked with edbus (deprecated DBUS API)
will fail to run and report this log :
CRI<12610>:dialer dialer/rc.c:442 \
rc_init() Elementary does not support DBus.
CRI<12610>:dialer dialer/main.c:166 \
elm_main() Could not setup remote control via DBus.
Bug: T1354
Change-Id: Id05ba2b5282243ccb566fc7b1ffb4b1e114004b1
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Test Plan: Bug-Tizen: TIVI-3234
Reviewers: cedric
Reviewed By: cedric
CC: cedric
Differential Revision: https://phab.enlightenment.org/D1116
Signed-off-by: Cedric BAIL <c.bail@partner.samsung.com>
| -rw-r--r-- | src/lib/elm_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 240c9f785..bcea782fd 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -467,7 +467,8 @@ elm_need_e_dbus(void) #ifndef RTLD_NOLOAD # define RTLD_NOLOAD RTLD_GLOBAL #endif - if (!e_dbus_handle) e_dbus_handle = dlopen("libeldbus.so", RTLD_LAZY | RTLD_NOLOAD); + if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so", RTLD_LAZY | RTLD_NOLOAD); + if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so.1", RTLD_LAZY | RTLD_NOLOAD); if (!e_dbus_handle) return EINA_FALSE; init_func = dlsym(e_dbus_handle, "e_dbus_init"); if (!init_func) return EINA_FALSE; |