Diff between 935f00c38eac6f4ad167caaff1fb7912fc84d56d and 211412b840d94372bcbad0f5fc6e8388a6a38fa9

Changed Files

File Additions Deletions Status
profiles/audio/avctp.c +1 -1 modified
profiles/audio/avdtp.c +1 -1 modified
profiles/audio/avrcp.c +1 -1 modified
profiles/audio/control.c +1 -1 modified
profiles/audio/manager.c +1 -1 modified
profiles/audio/media.c +1 -2 modified
profiles/audio/transport.c +1 -2 modified
profiles/cyclingspeed/cyclingspeed.c +1 -1 modified
profiles/deviceinfo/deviceinfo.c +1 -1 modified
profiles/gatt/manager.c +1 -1 modified
profiles/health/hdp_manager.c +1 -1 modified
profiles/health/hdp_util.c +3 -3 modified
profiles/heartrate/heartrate.c +1 -1 modified
profiles/input/manager.c +2 -1 modified
profiles/input/server.c +2 -2 modified
profiles/network/common.c +1 -1 modified
profiles/network/manager.c +1 -1 modified
profiles/network/server.c +1 -1 modified
profiles/proximity/manager.c +1 -1 modified
profiles/sap/server.c +2 -2 modified
profiles/thermometer/thermometer.c +1 -2 modified

Full Patch

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index d39bbab..4309c60 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -41,12 +41,12 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
 #include <bluetooth/l2cap.h>
 
 #include <glib.h>
 #include <btio/btio.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 29a5619..4921fdc 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -39,7 +39,6 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
@@ -47,6 +46,7 @@
 
 #include "log.h"
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index ce070cd..a139606 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -41,12 +41,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 642fdd5..18c8478 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -40,12 +40,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index f0df8ed..934227e 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -42,13 +42,13 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <btio/btio.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "glib-helper.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index e4206e3..00aa2f4 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -29,11 +29,10 @@
 
 #include <errno.h>
 
-#include <bluetooth/uuid.h>
-
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/dbus-common.h"
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 58240ac..a4370a5 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -28,11 +28,10 @@
 
 #include <errno.h>
 
-#include <bluetooth/uuid.h>
-
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/dbus-common.h"
diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index f016131..fc72791 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -27,9 +27,9 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "adapter.h"
 #include "device.h"
diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
index 7a97ecc..fb423fa 100644
--- a/profiles/deviceinfo/deviceinfo.c
+++ b/profiles/deviceinfo/deviceinfo.c
@@ -28,8 +28,8 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "adapter.h"
 #include "device.h"
diff --git a/profiles/gatt/manager.c b/profiles/gatt/manager.c
index 151d60f..2f2bd14 100644
--- a/profiles/gatt/manager.c
+++ b/profiles/gatt/manager.c
@@ -27,8 +27,8 @@
 #include <glib.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index b801706..87e70cd 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -28,8 +28,8 @@
 
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include <btio/btio.h>
 #include <adapter.h>
 #include <device.h>
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index ed987e3..b53f1db 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -36,13 +36,13 @@
 
 #include <sdpd.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 #include <sdp-client.h>
 #include <glib-helper.h>
 
-#include <btio/btio.h>
+#include "lib/uuid.h"
+#include "btio/btio.h"
 
-#include <log.h>
+#include "log.h"
 
 #include "dbus-common.h"
 #include "mcap.h"
diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c
index bc98683..5c56d3f 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -27,9 +27,9 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "adapter.h"
 #include "dbus-common.h"
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index a06edd2..6ed12ee 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -31,10 +31,11 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include "log.h"
 #include "plugin.h"
+
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/profile.h"
diff --git a/profiles/input/server.c b/profiles/input/server.c
index 8476b7c..e15ae88 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -31,7 +31,6 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
@@ -39,7 +38,8 @@
 #include "log.h"
 
 #include "glib-helper.h"
-#include <btio/btio.h>
+#include "btio/btio.h"
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/profile.h"
diff --git a/profiles/network/common.c b/profiles/network/common.c
index 34bdc0e..e069892 100644
--- a/profiles/network/common.c
+++ b/profiles/network/common.c
@@ -39,12 +39,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
 #include <bluetooth/bnep.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 
 #include "log.h"
 #include "common.h"
+#include "lib/uuid.h"
 
 static int ctl;
 
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index 79517d0..bc553c4 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -30,7 +30,6 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/bnep.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <gdbus/gdbus.h>
@@ -38,6 +37,7 @@
 #include "log.h"
 #include "plugin.h"
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
diff --git a/profiles/network/server.c b/profiles/network/server.c
index 2869c28..864b49c 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -34,13 +34,13 @@
 #include <bluetooth/bnep.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 #include <netinet/in.h>
 
 #include <glib.h>
 #include <gdbus/gdbus.h>
 #include <btio/btio.h>
 
+#include "lib/uuid.h"
 #include "../src/dbus-common.h"
 #include "../src/adapter.h"
 
diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c
index c3d0933..b405f15 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -30,8 +30,8 @@
 
 #include <glib.h>
 #include <gdbus/gdbus.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 0fa4e7c..dfcf0f1 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -32,10 +32,10 @@
 #include <glib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
+#include "btio/btio.h"
 #include "adapter.h"
-#include <btio/btio.h>
 #include "sdpd.h"
 #include "log.h"
 #include "error.h"
diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c
index 2a07eac..0cf14e6 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -27,10 +27,9 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <bluetooth/uuid.h>
-
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "dbus-common.h"
 #include "adapter.h"