Rename glib-helper to uuid-helper

Makefile.am

@@ -137,7 +137,7 @@ src_bluetoothd_SOURCES = $(builtin_sources) \
 			src/sdp-xml.h src/sdp-xml.c \
 			src/sdp-client.h src/sdp-client.c \
 			src/textfile.h src/textfile.c \
-			src/glib-helper.h src/glib-helper.c \
+			src/uuid-helper.h src/uuid-helper.c \
 			src/uinput.h \
 			src/plugin.h src/plugin.c \
 			src/storage.h src/storage.c \
@@ -225,7 +225,7 @@ AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
 
 unit_tests = unit/test-eir unit/test-uuid unit/test-textfile unit/test-crc
 
-unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
+unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/uuid-helper.c
 unit_test_eir_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
 
 unit_test_uuid_SOURCES = unit/test-uuid.c

Makefile.tools

@@ -262,7 +262,7 @@ tools_hwdb_LDADD = lib/libbluetooth-internal.la
 
 tools_hcieventmask_LDADD = lib/libbluetooth-internal.la
 
-tools_btmgmt_SOURCES = tools/btmgmt.c src/glib-helper.c \
+tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c \
 				monitor/mainloop.h monitor/mainloop.c \
 				src/shared/io.h src/shared/io-mainloop.c \
 				src/shared/queue.h src/shared/queue.c \

android/Makefile.am

@@ -21,7 +21,7 @@ android_bluetoothd_SOURCES = android/main.c \
 				android/utils.h \
 				src/sdpd-database.c src/sdpd-server.c \
 				src/sdpd-service.c src/sdpd-request.c \
-				src/glib-helper.h src/glib-helper.c \
+				src/uuid-helper.h src/uuid-helper.c \
 				src/eir.h src/eir.c \
 				src/shared/io.h src/shared/io-glib.c \
 				src/shared/queue.h src/shared/queue.c \

android/bluetooth.c

@@ -38,7 +38,7 @@
 #include "lib/sdp.h"
 #include "lib/mgmt.h"
 #include "src/shared/mgmt.h"
-#include "src/glib-helper.h"
+#include "src/uuid-helper.h"
 #include "src/eir.h"
 #include "lib/sdp.h"
 #include "lib/sdp_lib.h"

android/hidhost.c

@@ -40,7 +40,7 @@
 #include "lib/uuid.h"
 #include "src/shared/mgmt.h"
 #include "src/sdp-client.h"
-#include "src/glib-helper.h"
+#include "src/uuid-helper.h"
 #include "profiles/input/uhid_copy.h"
 
 #include "log.h"

android/pan.c

@@ -39,7 +39,7 @@
 #include "lib/bnep.h"
 #include "lib/sdp.h"
 #include "lib/sdp_lib.h"
-#include "src/glib-helper.h"
+#include "src/uuid-helper.h"
 #include "profiles/network/bnep.h"
 
 #include "log.h"

profiles/audio/control.c

@@ -56,7 +56,7 @@
 #include "avctp.h"
 #include "control.h"
 #include "sdpd.h"
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "dbus-common.h"
 
 static GSList *devices = NULL;

profiles/audio/media.c

@@ -40,7 +40,7 @@
 #include "src/dbus-common.h"
 #include "src/profile.h"
 
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "log.h"
 #include "error.h"
 #include "avdtp.h"

profiles/health/hdp_manager.c

@@ -35,7 +35,7 @@
 #include <device.h>
 #include <profile.h>
 #include <service.h>
-#include <glib-helper.h>
+#include <uuid-helper.h>
 #include <log.h>
 
 #include "hdp_types.h"

profiles/health/hdp_util.c

@@ -37,7 +37,7 @@
 #include <sdpd.h>
 #include <bluetooth/sdp_lib.h>
 #include <sdp-client.h>
-#include <glib-helper.h>
+#include <uuid-helper.h>
 
 #include "lib/uuid.h"
 #include "btio/btio.h"

profiles/input/server.c

@@ -37,7 +37,7 @@
 
 #include "log.h"
 
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "btio/btio.h"
 #include "lib/uuid.h"
 #include "../src/adapter.h"

src/adapter.c

@@ -59,7 +59,7 @@
 #include "profile.h"
 #include "dbus-common.h"
 #include "error.h"
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "agent.h"
 #include "storage.h"
 #include "attrib/gattrib.h"

src/device.c

@@ -58,7 +58,7 @@
 #include "service.h"
 #include "dbus-common.h"
 #include "error.h"
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "sdp-client.h"
 #include "attrib/gatt.h"
 #include "agent.h"

src/eir.c

@@ -37,7 +37,7 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/sdp.h>
 
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "eir.h"
 
 #define EIR_OOB_MIN (2 + 6)

src/profile.c

@@ -43,7 +43,7 @@
 #include "sdpd.h"
 #include "log.h"
 #include "error.h"
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "dbus-common.h"
 #include "sdp-client.h"
 #include "sdp-xml.h"

src/storage.c

@@ -44,7 +44,7 @@
 
 #include "lib/uuid.h"
 #include "textfile.h"
-#include "glib-helper.h"
+#include "uuid-helper.h"
 #include "storage.h"
 
 /* When all services should trust a remote device */

src/uuid-helper.c

@@ -34,7 +34,7 @@
 
 #include <glib.h>
 
-#include "glib-helper.h"
+#include "uuid-helper.h"
 
 char *bt_modalias(uint16_t source, uint16_t vendor,
 					uint16_t product, uint16_t version)

tools/btmgmt.c

@@ -40,7 +40,7 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "glib-helper.h"
+#include "uuid-helper.h"
 
 #include "monitor/mainloop.h"
 #include "src/shared/util.h"