From a490cf0e0e1de230a0f2fdcacaf27a4190cddbe0 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Mon, 7 Jul 2014 19:21:57 +0200 Subject: [PATCH] edbus: fix dlopening of the right library. Summary: Change-Id: I94e3d39286df830ef07ed2bda0ec87fce34cec4a Bug: T1354 Signed-off-by: Philippe Coval 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 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 --- src/lib/elm_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 5fc8c37..bcd7213 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -469,7 +469,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; -- 2.7.4