colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem-mbim: avoid using MM_CORE_ERROR_CANCELLED

Browse Source
This commit is contained in:
Aleksander Morgado
2019-10-09 10:48:55 +02:00
parent c0e1bde03e
commit 7974933de8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mm-broadband-modem-mbim.c
View File

@@ -4521,23 +4521,23 @@ process_ussd_message (MMBroadbandModemMbim *self,
break; break;
case MBIM_USSD_RESPONSE_TERMINATED_BY_NETWORK: case MBIM_USSD_RESPONSE_TERMINATED_BY_NETWORK:
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, "USSD terminated by network"); error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_ABORTED, "USSD terminated by network");
break; break;
case MBIM_USSD_RESPONSE_OTHER_LOCAL_CLIENT: case MBIM_USSD_RESPONSE_OTHER_LOCAL_CLIENT:
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, "Another ongoing USSD operation is in progress"); error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_RETRY, "Another ongoing USSD operation is in progress");
break; break;
case MBIM_USSD_RESPONSE_OPERATION_NOT_SUPPORTED: case MBIM_USSD_RESPONSE_OPERATION_NOT_SUPPORTED:
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, "Operation not supported"); error = g_error_new (MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NOT_SUPPORTED, "Operation not supported");
break; break;
case MBIM_USSD_RESPONSE_NETWORK_TIMEOUT: case MBIM_USSD_RESPONSE_NETWORK_TIMEOUT:
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, "Network timeout"); error = g_error_new (MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT, "Network timeout");
break; break;
default: default:
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, "Unknown USSD response (%u)", ussd_response); error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Unknown USSD response (%u)", ussd_response);
break; break;
} }
@@ -4851,7 +4851,7 @@ ussd_cancel_ready (MbimDevice *device,
task = self->priv->pending_ussd_action; task = self->priv->pending_ussd_action;
self->priv->pending_ussd_action = NULL; self->priv->pending_ussd_action = NULL;
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_ABORTED,
"USSD session was cancelled"); "USSD session was cancelled");
g_object_unref (task); g_object_unref (task);
} }