OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9cf8e7a
)
core: Store global D-Bus connection for adapter handling
author
Marcel Holtmann
<marcel@holtmann.org>
Sat, 5 Jan 2013 04:27:22 +0000
(20:27 -0800)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sat, 5 Jan 2013 04:27:22 +0000
(20:27 -0800)
src/adapter.c
patch
|
blob
|
history
diff --git
a/src/adapter.c
b/src/adapter.c
index
542111c
..
df817db
100644
(file)
--- a/
src/adapter.c
+++ b/
src/adapter.c
@@
-85,6
+85,8
@@
#define REMOVE_TEMP_TIMEOUT (3 * 60)
+static DBusConnection *dbus_conn = NULL;
+
static GSList *adapters = NULL;
static int default_adapter_id = -1;
@@
-4302,6
+4304,8
@@
static void mgmt_debug(const char *str, void *user_data)
int adapter_init(void)
{
+ dbus_conn = btd_get_dbus_connection();
+
mgmt_master = mgmt_new_default();
if (!mgmt_master) {
error("Failed to access management interface");
@@
-4354,4
+4358,6
@@
void adapter_cleanup(void)
mgmt_unref(mgmt_master);
mgmt_master = NULL;
+
+ dbus_conn = NULL;
}