Diff between 1f6d1c1259313ee19f7003bf6ae06763c0a6ecb7 and 5b04fdb8d2d94ff5dcfb161418b414a10a86ed7a

Changed Files

File Additions Deletions Status
src/adapter.c +1 -1 modified
src/adapter.h +1 -1 modified
src/manager.c +1 -1 modified

Full Patch

diff --git a/src/adapter.c b/src/adapter.c
index 0f351e6..31a6b51 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2795,7 +2795,7 @@ static void load_config(struct btd_adapter *adapter)
 	g_key_file_free(key_file);
 }
 
-gboolean adapter_init(struct btd_adapter *adapter, gboolean powered,
+gboolean adapter_setup(struct btd_adapter *adapter, gboolean powered,
 					bool connectable, bool discoverable)
 {
 	struct agent *agent;
diff --git a/src/adapter.h b/src/adapter.h
index 8090d98..572a0af 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -93,7 +93,7 @@ void adapter_remove_device(struct btd_adapter *adapter,
 						gboolean remove_storage);
 
 struct btd_adapter *adapter_create(int id);
-gboolean adapter_init(struct btd_adapter *adapter, gboolean powered,
+gboolean adapter_setup(struct btd_adapter *adapter, gboolean powered,
 					bool connectable, bool discoverable);
 void adapter_remove(struct btd_adapter *adapter);
 void adapter_set_discovering(struct btd_adapter *adapter,
diff --git a/src/manager.c b/src/manager.c
index 484b801..6e0ff12 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -162,7 +162,7 @@ struct btd_adapter *btd_manager_register_adapter(int id, gboolean powered,
 
 	adapters = g_slist_append(adapters, adapter);
 
-	if (!adapter_init(adapter, powered, connectable, discoverable)) {
+	if (!adapter_setup(adapter, powered, connectable, discoverable)) {
 		adapters = g_slist_remove(adapters, adapter);
 		btd_adapter_unref(adapter);
 		return NULL;