diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-01-09 12:07:51 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:48 +0100 |
| commit | 2a0deb47f4e170b6cf7b20e72355dab86e0518b9 (patch) | |
| tree | 6320eb14fbc9f26ec6d2cec0766e5c9a50367f83 /src/mm-iface-modem-cdma.c | |
| parent | 56956a36adcb11e7c789f8ef6518a2afae990f84 (diff) | |
bearer-cdma: avoid the need of the modem object during new_finish()
Diffstat (limited to 'src/mm-iface-modem-cdma.c')
| -rw-r--r-- | src/mm-iface-modem-cdma.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c index 732e4e46..53ab025f 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/mm-iface-modem-cdma.c @@ -381,14 +381,13 @@ mm_iface_modem_cdma_create_bearer_finish (MMIfaceModemCdma *self, MMModemCdmaRegistrationState evdo_current_state; MMBearer *bearer; - g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer_finish != NULL); - bearer = MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer_finish (self, - res, - error); + g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new_finish != NULL); + bearer = MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new_finish (res, + error); + if (!bearer) return NULL; - g_object_get (self, MM_IFACE_MODEM_CDMA_CDMA1X_REGISTRATION_STATE, &cdma1x_current_state, MM_IFACE_MODEM_CDMA_EVDO_REGISTRATION_STATE, &evdo_current_state, @@ -421,11 +420,12 @@ mm_iface_modem_cdma_create_bearer (MMIfaceModemCdma *self, GAsyncReadyCallback callback, gpointer user_data) { - g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer != NULL); - MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer (self, - properties, - callback, - user_data); + g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new != NULL); + MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new (self, + properties, + NULL, + callback, + user_data); } /*****************************************************************************/ |