}
/* Get the session bus. */
- g_conn = _bt_get_session_gconn();
+ g_conn = _bt_gdbus_get_session_gconn();
retv_if(g_conn == NULL, FALSE);
properties_proxy = g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE,
NULL, BT_OBEXD_DBUS_NAME,
ret_if(info == NULL);
- for (i = 0; i < info->file_count; i++) {
+ for (i = 0; i < info->file_count; i++)
g_free(info->file_path[i]);
- }
_bt_delete_request_id(info->request_id);
GError *error = NULL;
int result = BLUETOOTH_ERROR_NONE;
GVariant *param = NULL;
- g_dbus_proxy_call_finish(proxy, res, &error);
+ GVariant *reply = NULL;
+
+ reply = g_dbus_proxy_call_finish(proxy, res, &error);
if (proxy)
g_object_unref(proxy);
+ if (reply)
+ g_variant_unref(reply);
if (error) {
BT_ERR("%s", error->message);
GDBusProxy *session_proxy;
GError *err = NULL;
- g_conn = _bt_get_session_gconn();
+ g_conn = _bt_gdbus_get_session_gconn();
retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
retv_if(sending_info->session_path == NULL, BLUETOOTH_ERROR_INVALID_PARAM);
GVariant *val;
gsize len = 0;
while (g_variant_iter_loop(iter, "{sv}", &key, &val)) {
- if (g_strcmp0(key, "Name") == 0) {
+ if (g_strcmp0(key, "Name") == 0)
transfer_name = g_variant_dup_string(val, &len);
- } else if (g_strcmp0(key, "Filename") == 0) {
+ else if (g_strcmp0(key, "Filename") == 0)
file_name = g_variant_dup_string(val, &len);
- } else if (g_strcmp0(key, "Size") == 0) {
+ else if (g_strcmp0(key, "Size") == 0)
size = g_variant_get_uint64(val);
- }
}
g_variant_iter_free(iter);
}
sending_info->transfer_info->transfer_status = BT_TRANSFER_STATUS_QUEUED;
sending_info->result = BLUETOOTH_ERROR_NONE;
file_offset++;
+
+ g_free((gchar *)transfer_name);
+ g_free((gchar *)file_name);
}
void _bt_sending_files(void)
return;
if (file_offset < sending_info->file_count) {
/* Get the session bus. */
- g_conn = _bt_get_session_gconn();
+ g_conn = _bt_gdbus_get_session_gconn();
ret_if(g_conn == NULL);
client_proxy = g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE,
/* For IOPT compliance, change "text/x-iMelody" to "audio/imelody"
* because few devices(multimedia players) reject the OPP put for text objects
* since they support only multimedia files exchange */
- if(!strcasecmp(mime_type, "text/x-iMelody")) {
+ if (!strcasecmp(mime_type, "text/x-iMelody")) {
strncpy(mime_type, "audio/imelody", BT_MIME_TYPE_MAX_LEN);
BT_DBG("over writing mime type to = %s", mime_type);
}
- if(!strcasecmp(mime_type, "text/vcard")) {
+ if (!strcasecmp(mime_type, "text/vcard")) {
strncpy(mime_type, "text/x-vcard", BT_MIME_TYPE_MAX_LEN);
BT_DBG("over writing mime type to = %s", mime_type);
}
return;
}
- }else{
+ } else {
file_offset = 0;
__bt_sending_release();
}
BT_CHECK_PARAMETER(file_name_array, return);
/* Get the session bus. */
- g_conn = _bt_get_session_gconn();
+ g_conn = _bt_gdbus_get_session_gconn();
retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
client_proxy = g_dbus_proxy_new_sync(g_conn, G_DBUS_PROXY_FLAGS_NONE,