Return-Path: From: Mikel Astiz To: CC: Mikel Astiz Subject: [RFC obexd v3 05/20] client: replace SendFiles with SendFile Date: Tue, 13 Dec 2011 17:44:08 +0100 Message-ID: <1323794663-2711-6-git-send-email-mikel.astiz@bmw-carit.de> In-Reply-To: <1323794663-2711-1-git-send-email-mikel.astiz@bmw-carit.de> References: <1323794663-2711-1-git-send-email-mikel.astiz@bmw-carit.de> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: --- client/opp.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/client/opp.c b/client/opp.c index 3b24f85..396be1b 100644 --- a/client/opp.c +++ b/client/opp.c @@ -48,29 +48,27 @@ struct pull_data { static DBusConnection *conn = NULL; -static DBusMessage *opp_send_files(DBusConnection *connection, +static DBusMessage *opp_send_file(DBusConnection *connection, DBusMessage *message, void *user_data) { struct opp_data *opp = user_data; - DBusMessageIter iter, array; + DBusMessageIter iter; + char *filename; + char *basename; dbus_message_iter_init(message, &iter); - dbus_message_iter_recurse(&iter, &array); - - while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_STRING) { - char *filename; - char *basename; - dbus_message_iter_get_basic(&array, &filename); - basename = g_path_get_basename(filename); + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return g_dbus_create_error(message, + ERROR_INF ".InvalidArguments", NULL); - if (obc_session_send(opp->session, filename, basename) < 0) { - g_free(basename); - break; - } + dbus_message_iter_get_basic(&iter, &filename); + basename = g_path_get_basename(filename); + if (obc_session_send(opp->session, filename, basename) < 0) { g_free(basename); - dbus_message_iter_next(&array); + return g_dbus_create_error(message, + ERROR_INF ".Failed", NULL); } return dbus_message_new_method_return(message); @@ -134,7 +132,7 @@ static DBusMessage *opp_exchange_business_cards(DBusConnection *connection, } static GDBusMethodTable opp_methods[] = { - { "SendFiles", "as", "", opp_send_files, + { "SendFile", "s", "", opp_send_file, G_DBUS_METHOD_FLAG_ASYNC }, { "PullBusinessCard", "s", "", opp_pull_business_card, G_DBUS_METHOD_FLAG_ASYNC }, -- 1.7.6.4