diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-09-18 11:53:52 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-09-18 13:15:34 +0200 |
| commit | 4babcbe30edf254d17de9a2a6d55af3152d40f62 (patch) | |
| tree | 59b17ad251cfccc727d9f995a667a6b5c8a2e119 /src | |
| parent | 0e40bb7b11caf0079a2b9a1d0b387ef08b46254f (diff) | |
broadband-modem-qmi: new common method to peek a QMI client
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 720b2c85..b3938c70 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -88,6 +88,26 @@ struct _MMBroadbandModemQmiPrivate { /*****************************************************************************/ +static QmiClient * +peek_qmi_client (MMBroadbandModemQmi *self, + QmiService service, + GError **error) +{ + QmiClient *client; + + client = mm_qmi_port_peek_client (mm_base_modem_peek_port_qmi (MM_BASE_MODEM (self)), + service, + MM_QMI_PORT_FLAG_DEFAULT); + if (!client) + g_set_error (error, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't peek client for service '%s'", + qmi_service_get_string (service)); + + return client; +} + static gboolean ensure_qmi_client (MMBroadbandModemQmi *self, QmiService service, @@ -95,19 +115,16 @@ ensure_qmi_client (MMBroadbandModemQmi *self, GAsyncReadyCallback callback, gpointer user_data) { + GError *error = NULL; QmiClient *client; - client = mm_qmi_port_peek_client (mm_base_modem_peek_port_qmi (MM_BASE_MODEM (self)), - service, - MM_QMI_PORT_FLAG_DEFAULT); + client = peek_qmi_client (self, service, &error); if (!client) { - g_simple_async_report_error_in_idle (G_OBJECT (self), - callback, - user_data, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Couldn't peek client for service '%s'", - qmi_service_get_string (service)); + g_simple_async_report_take_gerror_in_idle ( + G_OBJECT (self), + callback, + user_data, + error); return FALSE; } |