summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinicius Gomes <vinicius.gomes@openbossa.org>2008-04-17 17:46:49 +0000
committerVinicius Gomes <vinicius.gomes@openbossa.org>2008-04-17 17:46:49 +0000
commite78a90944ca19bce2b2271e076a6dbbd332fc842 (patch)
tree1c197a79d225cc53b12dba03e1ae11a39a1cea6c
parent66327fddf82d027fbc98daefab771c23d5c3c1c9 (diff)
eglib: fixing the plugin loading when using the eglib.
-rw-r--r--acinclude.m42
-rw-r--r--hcid/plugin.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 59932ea1..10643eed 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -344,7 +344,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(GLIB, true)
else
AC_SUBST([GLIB_CFLAGS], ['-I$(top_srcdir)/eglib'])
- AC_SUBST([GLIB_LIBS], ['$(top_builddir)/eglib/libeglib.la -ldl'])
+ AC_SUBST([GLIB_LIBS], ['$(top_builddir)/eglib/libeglib.la -ldl -rdynamic'])
AC_SUBST([GMODULE_CFLAGS], [''])
AC_SUBST([GMODULE_LIBS], [''])
AM_CONDITIONAL(GLIB, false)
diff --git a/hcid/plugin.c b/hcid/plugin.c
index ca43ae72..7d275786 100644
--- a/hcid/plugin.c
+++ b/hcid/plugin.c
@@ -106,7 +106,7 @@ gboolean plugin_init(void)
continue;
}
- module = g_module_open(filename, 0);
+ module = g_module_open(filename, G_MODULE_BIND_LOCAL);
if (module == NULL) {
error("Can't load plugin: %s", g_module_error());
g_free(filename);
@@ -179,7 +179,7 @@ static struct adapter *ba2adapter(bdaddr_t *src)
if (dbus_connection_get_object_user_data(conn,
path, (void *) &adapter) == FALSE)
return NULL;
-
+
return adapter;
}
@@ -217,7 +217,7 @@ int plugin_req_auth(bdaddr_t *src, bdaddr_t *dst,
if (!device)
return -EPERM;
- /*
+ /*
* FIXME: Trusted device? Currently, service are based on a friendly
* name, it is necessary convert UUID128 to friendly name or store the
* UUID128 in the trusted file.