diff options
Diffstat (limited to 'plugins/altair')
| -rw-r--r-- | plugins/altair/mm-broadband-bearer-altair-lte.c | 12 | ||||
| -rw-r--r-- | plugins/altair/mm-broadband-bearer-altair-lte.h | 16 | ||||
| -rw-r--r-- | plugins/altair/mm-broadband-modem-altair-lte.c | 12 |
3 files changed, 19 insertions, 21 deletions
diff --git a/plugins/altair/mm-broadband-bearer-altair-lte.c b/plugins/altair/mm-broadband-bearer-altair-lte.c index 98172a15..1d188d58 100644 --- a/plugins/altair/mm-broadband-bearer-altair-lte.c +++ b/plugins/altair/mm-broadband-bearer-altair-lte.c @@ -229,7 +229,7 @@ connect_3gpp (MMBroadbandBearer *self, callback, user_data); - config = mm_bearer_peek_config (MM_BEARER (self)); + config = mm_base_bearer_peek_config (MM_BASE_BEARER (self)); apn = mm_port_serial_at_quote_string (mm_bearer_properties_get_apn (config)); command = g_strdup_printf ("%%APNN=%s",apn); g_free (apn); @@ -362,7 +362,7 @@ disconnect_3gpp (MMBroadbandBearer *self, /*****************************************************************************/ -MMBearer * +MMBaseBearer * mm_broadband_bearer_altair_lte_new_finish (GAsyncResult *res, GError **error) { @@ -377,9 +377,9 @@ mm_broadband_bearer_altair_lte_new_finish (GAsyncResult *res, return NULL; /* Only export valid bearers */ - mm_bearer_export (MM_BEARER (bearer)); + mm_base_bearer_export (MM_BASE_BEARER (bearer)); - return MM_BEARER (bearer); + return MM_BASE_BEARER (bearer); } void @@ -395,8 +395,8 @@ mm_broadband_bearer_altair_lte_new (MMBroadbandModemAltairLte *modem, cancellable, callback, user_data, - MM_BEARER_MODEM, modem, - MM_BEARER_CONFIG, config, + MM_BASE_BEARER_MODEM, modem, + MM_BASE_BEARER_CONFIG, config, NULL); } diff --git a/plugins/altair/mm-broadband-bearer-altair-lte.h b/plugins/altair/mm-broadband-bearer-altair-lte.h index 4b8f1036..907c7743 100644 --- a/plugins/altair/mm-broadband-bearer-altair-lte.h +++ b/plugins/altair/mm-broadband-bearer-altair-lte.h @@ -48,14 +48,12 @@ struct _MMBroadbandBearerAltairLteClass { GType mm_broadband_bearer_altair_lte_get_type (void); /* Default 3GPP bearer creation implementation */ -void mm_broadband_bearer_altair_lte_new (MMBroadbandModemAltairLte *modem, - MMBearerProperties *properties, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -MMBearer *mm_broadband_bearer_altair_lte_new_finish (GAsyncResult *res, - GError **error); - +void mm_broadband_bearer_altair_lte_new (MMBroadbandModemAltairLte *modem, + MMBearerProperties *properties, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +MMBaseBearer *mm_broadband_bearer_altair_lte_new_finish (GAsyncResult *res, + GError **error); #endif /* MM_BROADBAND_BEARER_ALTAIR_LTE_H */ diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c b/plugins/altair/mm-broadband-modem-altair-lte.c index c732c521..d58b6839 100644 --- a/plugins/altair/mm-broadband-modem-altair-lte.c +++ b/plugins/altair/mm-broadband-modem-altair-lte.c @@ -99,12 +99,12 @@ modem_power_down (MMIfaceModem *self, /*****************************************************************************/ /* Create Bearer (Modem interface) */ -static MMBearer * +static MMBaseBearer * modem_create_bearer_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - MMBearer *bearer; + MMBaseBearer *bearer; if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return NULL; @@ -119,7 +119,7 @@ broadband_bearer_new_ready (GObject *source, GAsyncResult *res, GSimpleAsyncResult *simple) { - MMBearer *bearer = NULL; + MMBaseBearer *bearer = NULL; GError *error = NULL; bearer = mm_broadband_bearer_altair_lte_new_finish (res, &error); @@ -710,11 +710,11 @@ typedef enum { } MMStatcmAltair; static void -bearer_list_report_disconnect_status_foreach (MMBearer *bearer, +bearer_list_report_disconnect_status_foreach (MMBaseBearer *bearer, gpointer *user_data) { - mm_bearer_report_connection_status (bearer, - MM_BEARER_CONNECTION_STATUS_DISCONNECTED); + mm_base_bearer_report_connection_status (bearer, + MM_BEARER_CONNECTION_STATUS_DISCONNECTED); } /*****************************************************************************/ |