25 files changed, 151 insertions, 64 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 00a1e28..297f674 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 AM_CPPFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) $(GIO_CFLAGS) $(DBUS_GLIB_CFLAGS)
 AM_LDFLAGS = $(DBUS_LIBS) $(GLIB_LIBS) $(GOBJECT_LIBS) $(GIO_LIBS) $(DBUS_GLIB_LIBS)
 
-BUILT_SOURCES = lib/marshallers.c lib/marshallers.h
-
+#BUILT_SOURCES = lib/marshallers.c lib/marshallers.h
+#
 #GENMARSHAL_FLAGS = --prefix="g_cclosure_bluez_marshal" --g-fatal-warnings
 #
 #lib/marshallers.h: lib/marshallers.list
@@ -11,6 +11,13 @@ BUILT_SOURCES = lib/marshallers.c lib/marshallers.h
 #lib/marshallers.c: lib/marshallers.list
 #			glib-genmarshal $(GENMARSHAL_FLAGS) --body lib/marshallers.list > lib/marshallers.c
 
+BUILT_SOURCES = $(top_srcdir)/.version
+
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version
+
 lib_sources = 	lib/marshallers.c lib/marshallers.h \
 		lib/dbus-common.c lib/dbus-common.h \
 		lib/helpers.c lib/helpers.h \
diff --git a/src/bt-device.c b/src/bt-device.c
index e6bef9e..afddc77 100644
--- a/src/bt-device.c
+++ b/src/bt-device.c
@@ -298,11 +298,12 @@ int main(int argc, char *argv[])
 
 		g_hash_table_iter_init(&iter, device_services);
 		while (g_hash_table_iter_next(&iter, &key, &value)) {
-			GMarkupParser xml_parser = {xml_start_element, xml_end_element, NULL, NULL, NULL};
-			GMarkupParseContext *xml_parse_context = g_markup_parse_context_new(&xml_parser, 0, NULL, NULL);
-			g_markup_parse_context_parse(xml_parse_context, value, strlen(value), &error);
-			exit_if_error(error);
-			g_markup_parse_context_free(xml_parse_context);
+			//GMarkupParser xml_parser = {xml_start_element, xml_end_element, NULL, NULL, NULL};
+			//GMarkupParseContext *xml_parse_context = g_markup_parse_context_new(&xml_parser, 0, NULL, NULL);
+			//g_markup_parse_context_parse(xml_parse_context, value, strlen(value), &error);
+			//exit_if_error(error);
+			//g_markup_parse_context_free(xml_parse_context);
+			g_print("%s", value);
 		}
 
 		g_print("Done\n");
diff --git a/src/bt-input.c b/src/bt-input.c
index 36a8ad7..42979d4 100644
--- a/src/bt-input.c
+++ b/src/bt-input.c
@@ -48,9 +48,9 @@ static gchar *connect_arg = NULL;
 static gchar *disconnect_arg = NULL;
 
 static GOptionEntry entries[] = {
-	{"adapter", 'a', 0, G_OPTION_ARG_STRING, &adapter_arg, "Adapter name or MAC", "adapter#id"},
-	{"connect", 'c', 0, G_OPTION_ARG_STRING, &connect_arg, "Connect to an input device", "device#id"},
-	{"disconnect", 'd', 0, G_OPTION_ARG_STRING, &disconnect_arg, "Disconnect from an input device", "device#id"},
+	{"adapter", 'a', 0, G_OPTION_ARG_STRING, &adapter_arg, "Adapter name or MAC", "<name|mac>"},
+	{"connect", 'c', 0, G_OPTION_ARG_STRING, &connect_arg, "Connect to an input device", "<name|mac>"},
+	{"disconnect", 'd', 0, G_OPTION_ARG_STRING, &disconnect_arg, "Disconnect from an input device", "<name|mac>"},
 	{NULL}
 };
 
@@ -63,8 +63,8 @@ int main(int argc, char *argv[])
 
 	context = g_option_context_new("- a bluetooth input manager");
 	g_option_context_add_main_entries(context, entries, NULL);
-	g_option_context_set_summary(context, "input summary");
-	g_option_context_set_description(context, "input desc");
+	g_option_context_set_summary(context, "Version "PACKAGE_VERSION);
+	g_option_context_set_description(context, "Report bugs to <"PACKAGE_BUGREPORT">.");
 
 	if (!g_option_context_parse(context, &argc, &argv, &error)) {
 		g_print("%s: %s\n", g_get_prgname(), error->message);
@@ -88,7 +88,10 @@ int main(int argc, char *argv[])
 	Device *device = find_device(adapter, connect_arg != NULL ? connect_arg : disconnect_arg, &error);
 	exit_if_error(error);
 
-	// TODO: Test to HID service
+	if (!intf_is_supported(device_get_dbus_object_path(device), INPUT_INTF)) {
+		g_printerr("Input service is not supported by this device\n");
+		exit(EXIT_FAILURE);
+	}
 
 	GMainLoop *mainloop = g_main_loop_new(NULL, FALSE);
 
diff --git a/src/lib/adapter.c b/src/lib/adapter.c
index 228ce81..009c037 100644
--- a/src/lib/adapter.c
+++ b/src/lib/adapter.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "adapter.h"
 
-#define BLUEZ_DBUS_ADAPTER_INTERFACE "org.bluez.Adapter"
-
 #define ADAPTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), ADAPTER_TYPE, AdapterPrivate))
 
 struct _AdapterPrivate {
@@ -252,12 +250,12 @@ static void adapter_post_init(Adapter *self, const gchar *dbus_object_path)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_ADAPTER_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_ADAPTER_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_ADAPTER_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_ADAPTER_INTERFACE);
 
 	/* DBus signals connection */
diff --git a/src/lib/adapter.h b/src/lib/adapter.h
index 54b099f..2d4a82c 100644
--- a/src/lib/adapter.h
+++ b/src/lib/adapter.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_ADAPTER_INTERFACE "org.bluez.Adapter"
+
 /*
  * Type macros
  */
diff --git a/src/lib/audio.c b/src/lib/audio.c
index 019df16..3e02761 100644
--- a/src/lib/audio.c
+++ b/src/lib/audio.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "audio.h"
 
-#define BLUEZ_DBUS_AUDIO_INTERFACE "org.bluez.Audio"
-
 #define AUDIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), AUDIO_TYPE, AudioPrivate))
 
 struct _AudioPrivate {
@@ -143,12 +141,12 @@ static void audio_post_init(Audio *self, const gchar *dbus_object_path)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_AUDIO_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_AUDIO_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_AUDIO_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_AUDIO_INTERFACE);
 
 	/* DBus signals connection */
diff --git a/src/lib/audio.h b/src/lib/audio.h
index 8275d50..f5e4da0 100644
--- a/src/lib/audio.h
+++ b/src/lib/audio.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_AUDIO_INTERFACE "org.bluez.Audio"
+
 /*
  * Type macros
  */
diff --git a/src/lib/device.c b/src/lib/device.c
index 7fc2797..04ba636 100644
--- a/src/lib/device.c
+++ b/src/lib/device.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "device.h"
 
-#define BLUEZ_DBUS_DEVICE_INTERFACE "org.bluez.Device"
-
 #define DEVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), DEVICE_TYPE, DevicePrivate))
 
 struct _DevicePrivate {
@@ -251,12 +249,12 @@ static void device_post_init(Device *self, const gchar *dbus_object_path)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_DEVICE_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_DEVICE_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_DEVICE_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_DEVICE_INTERFACE);
 
 	/* DBus signals connection */
diff --git a/src/lib/device.h b/src/lib/device.h
index 316220e..f689bdd 100644
--- a/src/lib/device.h
+++ b/src/lib/device.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_DEVICE_INTERFACE "org.bluez.Device"
+
 /*
  * Type macros
  */
diff --git a/src/lib/helpers.c b/src/lib/helpers.c
index d7b7557..d62c503 100644
--- a/src/lib/helpers.c
+++ b/src/lib/helpers.c
@@ -26,8 +26,10 @@
 #endif
 
 #include <glib.h>
+#include <dbus/dbus-glib.h>
 #include <string.h>
 
+#include "dbus-common.h"
 #include "manager.h"
 #include "helpers.h"
 
@@ -208,3 +210,57 @@ Device *find_device(Adapter *adapter, const gchar *name, GError **error)
 	return device;
 }
 
+gboolean intf_is_supported(const gchar *dbus_object_path, int intf_id)
+{
+	g_assert(conn != NULL);
+	g_assert(dbus_object_path != NULL);
+	g_assert(strlen(dbus_object_path) > 0);
+	gboolean intf_supported = FALSE;
+
+	/* Getting introspection XML */
+	DBusGProxy *introspection_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, "org.freedesktop.DBus.Introspectable");
+	gchar *introspection_xml = NULL;
+	GError *error = NULL;
+	if (!dbus_g_proxy_call(introspection_g_proxy, "Introspect", &error, G_TYPE_INVALID, G_TYPE_STRING, &introspection_xml, G_TYPE_INVALID)) {
+		g_critical("%s", error->message);
+	}
+	g_assert(error == NULL);
+
+	gchar *check_intf_regex_str = NULL;
+	switch (intf_id) {
+	case AUDIO_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_AUDIO_INTERFACE, "\">", NULL);
+		break;
+	case INPUT_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_INPUT_INTERFACE, "\">", NULL);
+		break;
+	case NETWORK_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_INTERFACE, "\">", NULL);
+		break;
+	case NETWORK_HUB_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_HUB_INTERFACE, "\">", NULL);
+		break;
+	case NETWORK_PEER_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_PEER_INTERFACE, "\">", NULL);
+		break;
+	case NETWORK_ROUTER_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE, "\">", NULL);
+		break;
+	case SERIAL_INTF:
+		check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_SERIAL_INTERFACE, "\">", NULL);
+		break;
+	default:
+		check_intf_regex_str = g_strconcat("<interface name=\"", "undefined", "\">", NULL);
+	}
+
+	if (g_regex_match_simple(check_intf_regex_str, introspection_xml, 0, 0)) {
+		intf_supported = TRUE;
+	}
+
+	g_free(check_intf_regex_str);
+	g_free(introspection_xml);
+	g_object_unref(introspection_g_proxy);
+
+	return intf_supported;
+}
+
diff --git a/src/lib/helpers.h b/src/lib/helpers.h
index b343867..2ec0797 100644
--- a/src/lib/helpers.h
+++ b/src/lib/helpers.h
@@ -29,6 +29,23 @@
 
 #include "adapter.h"
 #include "device.h"
+#include "audio.h"
+#include "input.h"
+#include "network.h"
+#include "network_hub.h"
+#include "network_peer.h"
+#include "network_router.h"
+#include "serial.h"
+
+enum {
+	AUDIO_INTF,
+	INPUT_INTF,
+	NETWORK_INTF,
+	NETWORK_HUB_INTF,
+	NETWORK_PEER_INTF,
+	NETWORK_ROUTER_INTF,
+	SERIAL_INTF,
+};
 
 /* Adapter helpers */
 Adapter *find_adapter(const gchar *name, GError **error);
@@ -51,5 +68,8 @@ inline int xtoi(const gchar *str) {
 
 const gchar *get_uuid_name(const gchar *uuid);
 
+/* Interface helpers */
+gboolean intf_is_supported(const gchar *dbus_object_path, int intf_id);
+
 #endif /* __HELPERS_H */
 
diff --git a/src/lib/input.c b/src/lib/input.c
index d11f650..a5e7f17 100644
--- a/src/lib/input.c
+++ b/src/lib/input.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "input.h"
 
-#define BLUEZ_DBUS_INPUT_INTERFACE "org.bluez.Input"
-
 #define INPUT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), INPUT_TYPE, InputPrivate))
 
 struct _InputPrivate {
@@ -143,12 +141,12 @@ static void input_post_init(Input *self, const gchar *dbus_object_path)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_INPUT_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_INPUT_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_INPUT_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_INPUT_INTERFACE);
 
 	/* DBus signals connection */
diff --git a/src/lib/input.h b/src/lib/input.h
index 2f7721e..0dd7b17 100644
--- a/src/lib/input.h
+++ b/src/lib/input.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_INPUT_INTERFACE "org.bluez.Input"
+
 /*
  * Type macros
  */
diff --git a/src/lib/manager.c b/src/lib/manager.c
index 2713e43..978fd58 100644
--- a/src/lib/manager.c
+++ b/src/lib/manager.c
@@ -31,9 +31,6 @@
 #include "marshallers.h"
 #include "manager.h"
 
-#define BLUEZ_DBUS_MANAGER_PATH "/"
-#define BLUEZ_DBUS_MANAGER_INTERFACE "org.bluez.Manager"
-
 #define MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), MANAGER_TYPE, ManagerPrivate))
 
 struct _ManagerPrivate {
@@ -162,12 +159,12 @@ static void manager_init(Manager *self)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_MANAGER_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_MANAGER_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_MANAGER_INTERFACE, BLUEZ_DBUS_MANAGER_PATH);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, BLUEZ_DBUS_MANAGER_PATH, BLUEZ_DBUS_MANAGER_INTERFACE);
 
diff --git a/src/lib/manager.h b/src/lib/manager.h
index 240aab8..770fd5e 100644
--- a/src/lib/manager.h
+++ b/src/lib/manager.h
@@ -26,6 +26,9 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_MANAGER_PATH "/"
+#define BLUEZ_DBUS_MANAGER_INTERFACE "org.bluez.Manager"
+
 /*
  * Type macros
  */
diff --git a/src/lib/network.c b/src/lib/network.c
index 94e7b67..092c05e 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "network.h"
 
-#define BLUEZ_DBUS_NETWORK_INTERFACE "org.bluez.Network"
-
 #define NETWORK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), NETWORK_TYPE, NetworkPrivate))
 
 struct _NetworkPrivate {
@@ -156,12 +154,12 @@ static void network_post_init(Network *self, const gchar *dbus_object_path)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_NETWORK_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_NETWORK_INTERFACE);
 
 	/* DBus signals connection */
diff --git a/src/lib/network.h b/src/lib/network.h
index c715d34..b0af8f2 100644
--- a/src/lib/network.h
+++ b/src/lib/network.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_NETWORK_INTERFACE "org.bluez.Network"
+
 /*
  * Type macros
  */
diff --git a/src/lib/network_hub.c b/src/lib/network_hub.c
index 3c09582..a746488 100644
--- a/src/lib/network_hub.c
+++ b/src/lib/network_hub.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "network_hub.h"
 
-#define BLUEZ_DBUS_NETWORK_HUB_INTERFACE "org.bluez.NetworkHub"
-
 #define NETWORK_HUB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), NETWORK_HUB_TYPE, NetworkHubPrivate))
 
 struct _NetworkHubPrivate {
@@ -135,12 +133,12 @@ static void network_hub_post_init(NetworkHub *self, const gchar *dbus_object_pat
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_HUB_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_HUB_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_NETWORK_HUB_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_NETWORK_HUB_INTERFACE);
 
 	/* Properties init */
diff --git a/src/lib/network_hub.h b/src/lib/network_hub.h
index 3a30f57..f989e5e 100644
--- a/src/lib/network_hub.h
+++ b/src/lib/network_hub.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_NETWORK_HUB_INTERFACE "org.bluez.NetworkHub"
+
 /*
  * Type macros
  */
diff --git a/src/lib/network_peer.c b/src/lib/network_peer.c
index 918371a..032619d 100644
--- a/src/lib/network_peer.c
+++ b/src/lib/network_peer.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "network_peer.h"
 
-#define BLUEZ_DBUS_NETWORK_PEER_INTERFACE "org.bluez.NetworkPeer"
-
 #define NETWORK_PEER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), NETWORK_PEER_TYPE, NetworkPeerPrivate))
 
 struct _NetworkPeerPrivate {
@@ -135,12 +133,12 @@ static void network_peer_post_init(NetworkPeer *self, const gchar *dbus_object_p
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_PEER_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_PEER_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_NETWORK_PEER_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_NETWORK_PEER_INTERFACE);
 
 	/* Properties init */
diff --git a/src/lib/network_peer.h b/src/lib/network_peer.h
index b5a4da3..6ef5746 100644
--- a/src/lib/network_peer.h
+++ b/src/lib/network_peer.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_NETWORK_PEER_INTERFACE "org.bluez.NetworkPeer"
+
 /*
  * Type macros
  */
diff --git a/src/lib/network_router.c b/src/lib/network_router.c
index f196b6a..6f8c576 100644
--- a/src/lib/network_router.c
+++ b/src/lib/network_router.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "network_router.h"
 
-#define BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE "org.bluez.NetworkRouter"
-
 #define NETWORK_ROUTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), NETWORK_ROUTER_TYPE, NetworkRouterPrivate))
 
 struct _NetworkRouterPrivate {
@@ -135,12 +133,12 @@ static void network_router_post_init(NetworkRouter *self, const gchar *dbus_obje
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE);
 
 	/* Properties init */
diff --git a/src/lib/network_router.h b/src/lib/network_router.h
index c2b80fd..a163608 100644
--- a/src/lib/network_router.h
+++ b/src/lib/network_router.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_NETWORK_ROUTER_INTERFACE "org.bluez.NetworkRouter"
+
 /*
  * Type macros
  */
diff --git a/src/lib/serial.c b/src/lib/serial.c
index ce0ef67..8028e41 100644
--- a/src/lib/serial.c
+++ b/src/lib/serial.c
@@ -31,8 +31,6 @@
 #include "marshallers.h"
 #include "serial.h"
 
-#define BLUEZ_DBUS_SERIAL_INTERFACE "org.bluez.Serial"
-
 #define SERIAL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), SERIAL_TYPE, SerialPrivate))
 
 struct _SerialPrivate {
@@ -111,12 +109,12 @@ static void serial_post_init(Serial *self, const gchar *dbus_object_path)
 	}
 	g_assert(error == NULL);
 
-	gchar *test_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_SERIAL_INTERFACE, "\">");
-	if (!g_regex_match_simple(test_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
+	gchar *check_intf_regex_str = g_strconcat("<interface name=\"", BLUEZ_DBUS_SERIAL_INTERFACE, "\">", NULL);
+	if (!g_regex_match_simple(check_intf_regex_str, self->priv->introspection_xml, 0, 0)) {
 		g_critical("Interface \"%s\" does not exist in \"%s\"", BLUEZ_DBUS_SERIAL_INTERFACE, dbus_object_path);
 		g_assert(FALSE);
 	}
-	g_free(test_intf_regex_str);
+	g_free(check_intf_regex_str);
 	self->priv->dbus_g_proxy = dbus_g_proxy_new_for_name(conn, BLUEZ_DBUS_NAME, dbus_object_path, BLUEZ_DBUS_SERIAL_INTERFACE);
 }
 
diff --git a/src/lib/serial.h b/src/lib/serial.h
index c7ec2a2..97b071b 100644
--- a/src/lib/serial.h
+++ b/src/lib/serial.h
@@ -26,6 +26,8 @@
 
 #include <glib-object.h>
 
+#define BLUEZ_DBUS_SERIAL_INTERFACE "org.bluez.Serial"
+
 /*
  * Type macros
  */