From: Piotr Dabrowski Date: Fri, 11 Nov 2016 10:25:45 +0000 (+0100) Subject: [bluetooth-frwk] bt_map_client_message_object_h X-Git-Tag: accepted/tizen/3.0/common/20161209.094745~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c95921b304bf84e037bb6e017a25a3e266790784;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git [bluetooth-frwk] bt_map_client_message_object_h Change-Id: I12eccc5b3f2bda2e39d9bf5f45c70aa2d6f309c4 --- diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index 9dc2ea0..8c3ba53 100644 --- a/bt-api/bt-event-handler.c +++ b/bt-api/bt-event-handler.c @@ -2149,8 +2149,8 @@ void __bt_map_client_event_filter(GDBusConnection *connection, GVariantIter *properites = NULL; int i = 0; while (g_variant_iter_loop(iter, "{oa{sv}}", &object, &properites)) { - messages_struct.message_items[i].message_object_name = strdup(object); - BT_DBG("Message found: %s", messages_struct.message_items[i].message_object_name); + messages_struct.message_items[i].message_object = strdup(object); + BT_DBG("Message found: %s", messages_struct.message_items[i].message_object); messages_struct.message_items[i].folder = NULL; messages_struct.message_items[i].subject = NULL; messages_struct.message_items[i].timestamp = NULL; diff --git a/bt-api/bt-map-client.c b/bt-api/bt-map-client.c index 0da32ed..05c5776 100644 --- a/bt-api/bt-map-client.c +++ b/bt-api/bt-map-client.c @@ -312,7 +312,7 @@ BT_EXPORT_API int bluetooth_map_client_push_message( BT_EXPORT_API int bluetooth_map_client_get_message( bt_map_client_session_info_s *session, - const char *message_object_name, + const bt_map_client_message_object_t message_object, const char *target_file, bool attachment) { @@ -322,7 +322,7 @@ BT_EXPORT_API int bluetooth_map_client_get_message( BT_CHECK_ENABLED(return); BT_CHECK_PARAMETER(session, return); BT_CHECK_PARAMETER(session->session_path, return); - BT_CHECK_PARAMETER(message_object_name, return); + BT_CHECK_PARAMETER(message_object, return); BT_CHECK_PARAMETER(target_file, return); bt_user_info_t *user_info = _bt_get_user_data(BT_COMMON); @@ -333,7 +333,7 @@ BT_EXPORT_API int bluetooth_map_client_get_message( // TODO session currently is not used, but should be valid //g_array_append_vals(in_param1, session->session_path, strlen(session->session_path)+1); - g_array_append_vals(in_param2, message_object_name, strlen(message_object_name)+1); + g_array_append_vals(in_param2, message_object, strlen(message_object)+1); g_array_append_vals(in_param3, target_file, strlen(target_file)+1); g_array_append_vals(in_param4, &attachment, sizeof(attachment)); diff --git a/bt-service/bt-request-handler.c b/bt-service/bt-request-handler.c index d0d00d6..c98149d 100644 --- a/bt-service/bt-request-handler.c +++ b/bt-service/bt-request-handler.c @@ -2352,12 +2352,12 @@ int __bt_obexd_request(int function_name, BT_DBG("BT_MAP_GET_MESSAGE"); // TODO session currently is not used, but should be valid //char* session_id = (char *)g_variant_get_data(in_param1); - char* message_object_name = (char *)g_variant_get_data(in_param2); + char* message_object = (char *)g_variant_get_data(in_param2); char* target_file = (char *)g_variant_get_data(in_param3); bool attachment = false; __bt_service_get_parameters(in_param4, &attachment, sizeof(bool)); - result = _bt_map_client_get_message(request_id, context, message_object_name, + result = _bt_map_client_get_message(request_id, context, message_object, target_file, attachment); if (result == BLUETOOTH_ERROR_NONE) { BT_DBG("_bt_map_client_get_message succeed"); diff --git a/bt-service/bt-service-map-client.c b/bt-service/bt-service-map-client.c index ff7ad9a..d2e7d3f 100644 --- a/bt-service/bt-service-map-client.c +++ b/bt-service/bt-service-map-client.c @@ -779,7 +779,7 @@ static void __bt_get_message_cb(GDBusProxy *proxy, int _bt_map_client_get_message( int request_id, GDBusMethodInvocation *context, - const char* message_object_name, + const char* message_object, const char* target_file, bool attachment) { @@ -790,7 +790,7 @@ int _bt_map_client_get_message( GError *error = NULL; int result = BLUETOOTH_ERROR_NONE; - retv_if(message_object_name == NULL, BLUETOOTH_ERROR_INVALID_PARAM); + retv_if(message_object == NULL, BLUETOOTH_ERROR_INVALID_PARAM); // TODO event listeners registration on first call, where should it be unregistered?? _bt_map_client_event_init(); @@ -806,7 +806,7 @@ int _bt_map_client_get_message( // create message proxy g_clear_error(&error); message_proxy = g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - BT_OBEX_SERVICE_NAME, message_object_name, "org.bluez.obex.Message1", + BT_OBEX_SERVICE_NAME, message_object, "org.bluez.obex.Message1", NULL, &error); if (error != NULL) { BT_ERR("Could not create message proxy: %s\n", error->message); diff --git a/bt-service/include/bt-service-map-client.h b/bt-service/include/bt-service-map-client.h index 2947c62..3479b3f 100644 --- a/bt-service/include/bt-service-map-client.h +++ b/bt-service/include/bt-service-map-client.h @@ -94,7 +94,7 @@ int _bt_map_client_push_message( int _bt_map_client_get_message( int request_id, GDBusMethodInvocation *context, - const char* message_object_name, + const char* message_object, const char* target_file, bool attachment); diff --git a/include/bluetooth-api.h b/include/bluetooth-api.h index 3151e0d..eead2ee 100644 --- a/include/bluetooth-api.h +++ b/include/bluetooth-api.h @@ -1804,6 +1804,8 @@ typedef struct { char* remote_address; } bt_map_client_session_info_s; +typedef char* bt_map_client_message_object_t; + typedef struct { int16_t offset; int16_t max_count; @@ -1824,7 +1826,7 @@ typedef struct { } bt_map_client_list_messages_filter_t; typedef struct { - char *message_object_name; + bt_map_client_message_object_t message_object; char *folder; char *subject; char *timestamp; @@ -4988,7 +4990,7 @@ int bluetooth_map_client_push_message( int bluetooth_map_client_get_message( bt_map_client_session_info_s *session, - const char *message_object_name, + const bt_map_client_message_object_t message_object, const char *target_file, bool attachment );