---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
