From 1ff927b79348b3d327407d779eeaf85d3899a797 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 23 May 2012 15:20:40 +0300 Subject: [PATCH] obexd: Change agent interface to org.bluez.obex.Agent --- obexd/plugins/syncevolution.c | 3 +-- obexd/src/manager.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c index b0cd626da..0778608a0 100644 --- a/obexd/plugins/syncevolution.c +++ b/obexd/plugins/syncevolution.c @@ -365,8 +365,7 @@ static ssize_t synce_read(void *object, void *buf, size_t count) append_dict_entry(&dict, "id", DBUS_TYPE_STRING, context->id); - snprintf(transport, sizeof(transport), "%s.obexd", - OPENOBEX_SERVICE); + snprintf(transport, sizeof(transport), "%s.obexd", OBEXD_SERVICE); append_dict_entry(&dict, "transport", DBUS_TYPE_STRING, transport); snprintf(transport_description, sizeof(transport_description), diff --git a/obexd/src/manager.c b/obexd/src/manager.c index 50338810e..bd192887b 100644 --- a/obexd/src/manager.c +++ b/obexd/src/manager.c @@ -49,6 +49,7 @@ #define ERROR_INTERFACE OBEXD_SERVICE ".Error" #define TRANSFER_INTERFACE OBEXD_SERVICE ".Transfer" #define SESSION_INTERFACE OBEXD_SERVICE ".Session" +#define AGENT_INTERFACE OBEXD_SERVICE ".Agent" #define TIMEOUT 60*1000 /* Timeout for user response (miliseconds) */ @@ -461,7 +462,7 @@ static void agent_cancel(void) return; msg = dbus_message_new_method_call(agent->bus_name, agent->path, - "org.openobex.Agent", "Cancel"); + AGENT_INTERFACE, "Cancel"); g_dbus_send_message(connection, msg); } @@ -547,7 +548,7 @@ int manager_request_authorization(struct obex_session *os, int32_t time, path = g_strdup_printf("/transfer%u", os->id); msg = dbus_message_new_method_call(agent->bus_name, agent->path, - "org.openobex.Agent", "Authorize"); + AGENT_INTERFACE, "Authorize"); dbus_message_append_args(msg, DBUS_TYPE_OBJECT_PATH, &path, -- 2.47.3