summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Coval <philippe.coval@open.eurogiciel.org>2014-07-07 19:21:57 +0200
committerCedric BAIL <c.bail@partner.samsung.com>2014-07-07 19:22:41 +0200
commita490cf0e0e1de230a0f2fdcacaf27a4190cddbe0 (patch)
treef7fa4f210b6a6f1ba978bd9dbe6e64e74abb75ee
parentd15a411ce0d1da698c663284103e6cd32bbd2375 (diff)
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 5fc8c37e1..bcd72135c 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -469,7 +469,8 @@ elm_need_e_dbus(void)
469#ifndef RTLD_NOLOAD 469#ifndef RTLD_NOLOAD
470# define RTLD_NOLOAD RTLD_GLOBAL 470# define RTLD_NOLOAD RTLD_GLOBAL
471#endif 471#endif
472 if (!e_dbus_handle) e_dbus_handle = dlopen("libeldbus.so", RTLD_LAZY | RTLD_NOLOAD); 472 if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so", RTLD_LAZY | RTLD_NOLOAD);
473 if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so.1", RTLD_LAZY | RTLD_NOLOAD);
473 if (!e_dbus_handle) return EINA_FALSE; 474 if (!e_dbus_handle) return EINA_FALSE;
474 init_func = dlsym(e_dbus_handle, "e_dbus_init"); 475 init_func = dlsym(e_dbus_handle, "e_dbus_init");
475 if (!init_func) return EINA_FALSE; 476 if (!init_func) return EINA_FALSE;