kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Philippe Coval 2014-07-07 19:21:57 +02:00 committed by Cedric BAIL
parent 578d366d23
commit e41f35e927
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/src/lib/elm_main.c
View File

@ -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;