diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-12-05 13:51:42 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-05 16:41:33 +0200 |
| commit | a163324e1aa0adfd7d7155303f837b7a4f6bd58c (patch) | |
| tree | 8d59c6938c0b67e2e1aec64ef66a41fc8f0ee4ad /profiles/cups | |
| parent | 88b483b154cc14305417b47221a1681118ec0700 (diff) | |
| download | bluez-a163324e1aa0adfd7d7155303f837b7a4f6bd58c.tar.gz | |
dbus: Rename to org.bluez.Adapter1
Trivially add the numbering suffix to org.bluez.Adapter according to
the proposal for BlueZ 5.
Diffstat (limited to 'profiles/cups')
| -rw-r--r-- | profiles/cups/main.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/profiles/cups/main.c b/profiles/cups/main.c index ae0cc6aef..ef3a17617 100644 --- a/profiles/cups/main.c +++ b/profiles/cups/main.c @@ -342,7 +342,7 @@ static void remote_device_found(const char *adapter, const char *bdaddr, assert(adapter != NULL); message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", + "org.bluez.Adapter1", "FindDevice"); dbus_message_iter_init_append(message, &iter); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); @@ -357,7 +357,7 @@ static void remote_device_found(const char *adapter, const char *bdaddr, if (!reply) { message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", + "org.bluez.Adapter1", "CreateDevice"); dbus_message_iter_init_append(message, &iter); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); @@ -417,7 +417,7 @@ static gboolean list_known_printers(const char *adapter) DBusMessage *message, *reply; message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", + "org.bluez.Adapter1", "ListDevices"); if (message == NULL) return FALSE; @@ -467,7 +467,7 @@ static gboolean list_known_printers(const char *adapter) static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *message, void *user_data) { - if (dbus_message_is_signal(message, "org.bluez.Adapter", + if (dbus_message_is_signal(message, "org.bluez.Adapter1", "DeviceFound")) { const char *adapter, *bdaddr; char *name; @@ -481,7 +481,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, if (parse_device_properties(&iter, &name, NULL)) remote_device_found(adapter, bdaddr, name); g_free (name); - } else if (dbus_message_is_signal(message, "org.bluez.Adapter", + } else if (dbus_message_is_signal(message, "org.bluez.Adapter1", "DeviceDisappeared")) { const char *bdaddr; @@ -489,7 +489,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBUS_TYPE_STRING, &bdaddr, DBUS_TYPE_INVALID); remote_device_disappeared(bdaddr); - } else if (dbus_message_is_signal(message, "org.bluez.Adapter", + } else if (dbus_message_is_signal(message, "org.bluez.Adapter1", "PropertyChanged")) { DBusMessageIter iter, value_iter; const char *name; @@ -582,7 +582,7 @@ static gboolean list_printers(void) #define MATCH_FORMAT \ "type='signal'," \ - "interface='org.bluez.Adapter'," \ + "interface='org.bluez.Adapter1'," \ "sender='org.bluez'," \ "path='%s'" @@ -595,7 +595,7 @@ static gboolean list_printers(void) doing_disco = TRUE; message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", + "org.bluez.Adapter1", "StartDiscovery"); if (!dbus_connection_send_with_reply(conn, message, NULL, -1)) { @@ -649,7 +649,7 @@ static gboolean print_ieee1284(const char *bdaddr) } message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", + "org.bluez.Adapter1", "FindDevice"); dbus_message_iter_init_append(message, &iter); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); @@ -664,7 +664,7 @@ static gboolean print_ieee1284(const char *bdaddr) if (!reply) { message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", + "org.bluez.Adapter1", "CreateDevice"); dbus_message_iter_init_append(message, &iter); dbus_message_iter_append_basic(&iter, |