diff options
Diffstat (limited to 'plugins/option/mm-broadband-bearer-hso.c')
| -rw-r--r-- | plugins/option/mm-broadband-bearer-hso.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c index c7c0e372..f1c0445e 100644 --- a/plugins/option/mm-broadband-bearer-hso.c +++ b/plugins/option/mm-broadband-bearer-hso.c @@ -317,7 +317,7 @@ connect_reset (Dial3gppContext *ctx) } static void -report_connection_status (MMBearer *bearer, +report_connection_status (MMBaseBearer *bearer, MMBearerConnectionStatus status) { MMBroadbandBearerHso *self = MM_BROADBAND_BEARER_HSO (bearer); @@ -341,7 +341,7 @@ report_connection_status (MMBearer *bearer, if (status == MM_BEARER_CONNECTION_STATUS_DISCONNECTED) { /* If no connection attempt on-going, make sure we mark ourselves as * disconnected */ - MM_BEARER_CLASS (mm_broadband_bearer_hso_parent_class)->report_connection_status ( + MM_BASE_BEARER_CLASS (mm_broadband_bearer_hso_parent_class)->report_connection_status ( bearer, status); } @@ -467,8 +467,8 @@ forced_close_cb (MMPortSerial *port, MMBroadbandBearerHso *self) { /* Just treat the forced close event as any other unsolicited message */ - mm_bearer_report_connection_status (MM_BEARER (self), - MM_BEARER_CONNECTION_STATUS_CONNECTION_FAILED); + mm_base_bearer_report_connection_status (MM_BASE_BEARER (self), + MM_BEARER_CONNECTION_STATUS_CONNECTION_FAILED); } static void @@ -594,9 +594,9 @@ authenticate (Dial3gppContext *ctx) return; } - user = mm_bearer_properties_get_user (mm_bearer_peek_config (MM_BEARER (ctx->self))); - password = mm_bearer_properties_get_password (mm_bearer_peek_config (MM_BEARER (ctx->self))); - allowed_auth = mm_bearer_properties_get_allowed_auth (mm_bearer_peek_config (MM_BEARER (ctx->self))); + user = mm_bearer_properties_get_user (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self))); + password = mm_bearer_properties_get_password (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self))); + allowed_auth = mm_bearer_properties_get_allowed_auth (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self))); /* Both user and password are required; otherwise firmware returns an error */ if (!user || !password || allowed_auth == MM_BEARER_ALLOWED_AUTH_NONE) { @@ -787,7 +787,7 @@ disconnect_3gpp (MMBroadbandBearer *self, /*****************************************************************************/ -MMBearer * +MMBaseBearer * mm_broadband_bearer_hso_new_finish (GAsyncResult *res, GError **error) { @@ -802,9 +802,9 @@ mm_broadband_bearer_hso_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 @@ -820,8 +820,8 @@ mm_broadband_bearer_hso_new (MMBroadbandModemHso *modem, cancellable, callback, user_data, - MM_BEARER_MODEM, modem, - MM_BEARER_CONFIG, config, + MM_BASE_BEARER_MODEM, modem, + MM_BASE_BEARER_CONFIG, config, NULL); } @@ -838,12 +838,12 @@ static void mm_broadband_bearer_hso_class_init (MMBroadbandBearerHsoClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - MMBearerClass *bearer_class = MM_BEARER_CLASS (klass); + MMBaseBearerClass *base_bearer_class = MM_BASE_BEARER_CLASS (klass); MMBroadbandBearerClass *broadband_bearer_class = MM_BROADBAND_BEARER_CLASS (klass); g_type_class_add_private (object_class, sizeof (MMBroadbandBearerHsoPrivate)); - bearer_class->report_connection_status = report_connection_status; + base_bearer_class->report_connection_status = report_connection_status; broadband_bearer_class->dial_3gpp = dial_3gpp; broadband_bearer_class->dial_3gpp_finish = dial_3gpp_finish; broadband_bearer_class->get_ip_config_3gpp = get_ip_config_3gpp; |