summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2013-01-11 00:23:58 +0000
committerCedric BAIL <cedric.bail@free.fr>2013-01-11 00:23:58 +0000
commitf0b1ae827ae14aab65ec54c60529690da03ba8ee (patch)
tree561d588939e9238fa1f8d7ea0f4a3c413dcf26a4
parent3d72d3fa0dfdfa690038b23776ba76fe6378f37b (diff)
elementary: fix mistake with ebus linking.
SVN revision: 82596
-rw-r--r--src/lib/elm_main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 1a89e8818..0804a6a72 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -366,8 +366,11 @@ elm_need_e_dbus(void)
366 int (*init_func)(void) = NULL; 366 int (*init_func)(void) = NULL;
367 367
368 if (_elm_need_e_dbus) return EINA_TRUE; 368 if (_elm_need_e_dbus) return EINA_TRUE;
369 /* FIXME: Maybe we should use RTLD_NOLOAD */ 369 /* We use RTLD_NOLOAD when available, so we are sure to use the 'libedbus' that was linked to the binary */
370 if (!e_dbus_handle) dlopen("libedbus.so", RTLD_LAZY | RTLD_GLOBAL); 370#ifndef RTLD_NOLOAD
371# define RTLD_NOLOAD RTLD_GLOBAL
372#endif
373 if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so", RTLD_LAZY | RTLD_NOLOAD);
371 if (!e_dbus_handle) return EINA_FALSE; 374 if (!e_dbus_handle) return EINA_FALSE;
372 init_func = dlsym(e_dbus_handle, "e_dbus_init"); 375 init_func = dlsym(e_dbus_handle, "e_dbus_init");
373 if (!init_func) return EINA_FALSE; 376 if (!init_func) return EINA_FALSE;