diff options
| -rw-r--r-- | src/bt-device.c | 22 | ||||
| -rw-r--r-- | src/lib/agent-helper.c | 2 | ||||
| -rw-r--r-- | src/lib/agent-helper.h | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/bt-device.c b/src/bt-device.c index 2b16432..a739b98 100644 --- a/src/bt-device.c +++ b/src/bt-device.c @@ -610,18 +610,18 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - g_print("[%s]\n", device_get_address(device, &error)); - g_print(" Name: %s\n", device_get_name(device, &error)); - g_print(" Alias: %s [rw]\n", device_get_alias(device, &error)); - g_print(" Address: %s\n", device_get_address(device, &error)); - g_print(" Icon: %s\n", device_get_icon(device, &error)); - g_print(" Class: 0x%x\n", device_get_class(device, &error)); - g_print(" Paired: %d\n", device_get_paired(device, &error)); - g_print(" Trusted: %d [rw]\n", device_get_trusted(device, &error)); - g_print(" Blocked: %d [rw]\n", device_get_blocked(device, &error)); - g_print(" Connected: %d\n", device_get_connected(device, &error)); + g_print("[%s]\n", device_get_address(device, NULL)); + g_print(" Name: %s\n", device_get_name(device, NULL)); + g_print(" Alias: %s [rw]\n", device_get_alias(device, NULL)); + g_print(" Address: %s\n", device_get_address(device, NULL)); + g_print(" Icon: %s\n", device_get_icon(device, NULL)); + g_print(" Class: 0x%x\n", device_get_class(device, NULL)); + g_print(" Paired: %d\n", device_get_paired(device, NULL)); + g_print(" Trusted: %d [rw]\n", device_get_trusted(device, NULL)); + g_print(" Blocked: %d [rw]\n", device_get_blocked(device, NULL)); + g_print(" Connected: %d\n", device_get_connected(device, NULL)); g_print(" UUIDs: ["); - const gchar **uuids = device_get_uuids(device, &error); + const gchar **uuids = device_get_uuids(device, NULL); for (int j = 0; uuids[j] != NULL; j++) { if (j > 0) g_print(", "); diff --git a/src/lib/agent-helper.c b/src/lib/agent-helper.c index bf50bcc..2b94100 100644 --- a/src/lib/agent-helper.c +++ b/src/lib/agent-helper.c @@ -33,6 +33,8 @@ #include "agent-helper.h" +gboolean agent_need_unregister; + static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n"; static guint _bt_agent_registration_id = 0; static GHashTable *_pin_hash_table = NULL; diff --git a/src/lib/agent-helper.h b/src/lib/agent-helper.h index 8e1cc85..9a952c4 100644 --- a/src/lib/agent-helper.h +++ b/src/lib/agent-helper.h @@ -35,7 +35,7 @@ extern "C" { #define AGENT_DBUS_INTERFACE "org.bluez.Agent1" #define AGENT_PATH "/org/blueztools" -gboolean agent_need_unregister; +extern gboolean agent_need_unregister; void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error); void unregister_agent_callbacks(GError **error); @@ -44,4 +44,4 @@ void unregister_agent_callbacks(GError **error); } #endif -#endif /* __AGENT_HELPER_H */
\ No newline at end of file +#endif /* __AGENT_HELPER_H */ |