aboutsummaryrefslogtreecommitdiff
path: root/plugins/icera
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/icera')
-rw-r--r--plugins/icera/mm-broadband-bearer-icera.c28
-rw-r--r--plugins/icera/mm-broadband-bearer-icera.h16
-rw-r--r--plugins/icera/mm-broadband-modem-icera.c16
3 files changed, 30 insertions, 30 deletions
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c
index ed4f4a4a..c4a40c22 100644
--- a/plugins/icera/mm-broadband-bearer-icera.c
+++ b/plugins/icera/mm-broadband-bearer-icera.c
@@ -576,8 +576,8 @@ forced_close_cb (MMPortSerial *port,
MMBroadbandBearerIcera *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
@@ -855,9 +855,9 @@ authenticate (Dial3gppContext *ctx)
const gchar *password;
MMBearerAllowedAuth allowed_auth;
- 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) {
@@ -954,7 +954,7 @@ dial_3gpp (MMBroadbandBearer *self,
/*****************************************************************************/
static void
-report_connection_status (MMBearer *bearer,
+report_connection_status (MMBaseBearer *bearer,
MMBearerConnectionStatus status)
{
MMBroadbandBearerIcera *self = MM_BROADBAND_BEARER_ICERA (bearer);
@@ -979,7 +979,7 @@ report_connection_status (MMBearer *bearer,
status == MM_BEARER_CONNECTION_STATUS_CONNECTION_FAILED) {
/* If no connection/disconnection attempt on-going, make sure we mark ourselves as
* disconnected. Make sure we only pass 'DISCONNECTED' to the parent */
- MM_BEARER_CLASS (mm_broadband_bearer_icera_parent_class)->report_connection_status (
+ MM_BASE_BEARER_CLASS (mm_broadband_bearer_icera_parent_class)->report_connection_status (
bearer,
MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
}
@@ -987,7 +987,7 @@ report_connection_status (MMBearer *bearer,
/*****************************************************************************/
-MMBearer *
+MMBaseBearer *
mm_broadband_bearer_icera_new_finish (GAsyncResult *res,
GError **error)
{
@@ -1002,9 +1002,9 @@ mm_broadband_bearer_icera_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
@@ -1021,8 +1021,8 @@ mm_broadband_bearer_icera_new (MMBroadbandModem *modem,
cancellable,
callback,
user_data,
- MM_BEARER_MODEM, modem,
- MM_BEARER_CONFIG, config,
+ MM_BASE_BEARER_MODEM, modem,
+ MM_BASE_BEARER_CONFIG, config,
MM_BROADBAND_BEARER_ICERA_DEFAULT_IP_METHOD, ip_method,
NULL);
}
@@ -1079,14 +1079,14 @@ static void
mm_broadband_bearer_icera_class_init (MMBroadbandBearerIceraClass *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 (MMBroadbandBearerIceraPrivate));
object_class->get_property = get_property;
object_class->set_property = set_property;
- 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;
diff --git a/plugins/icera/mm-broadband-bearer-icera.h b/plugins/icera/mm-broadband-bearer-icera.h
index f513659c..8061e216 100644
--- a/plugins/icera/mm-broadband-bearer-icera.h
+++ b/plugins/icera/mm-broadband-bearer-icera.h
@@ -52,13 +52,13 @@ struct _MMBroadbandBearerIceraClass {
GType mm_broadband_bearer_icera_get_type (void);
/* Default bearer creation implementation */
-void mm_broadband_bearer_icera_new (MMBroadbandModem *modem,
- MMBearerIpMethod ip_method,
- MMBearerProperties *config,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-MMBearer *mm_broadband_bearer_icera_new_finish (GAsyncResult *res,
- GError **error);
+void mm_broadband_bearer_icera_new (MMBroadbandModem *modem,
+ MMBearerIpMethod ip_method,
+ MMBearerProperties *config,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+MMBaseBearer *mm_broadband_bearer_icera_new_finish (GAsyncResult *res,
+ GError **error);
#endif /* MM_BROADBAND_BEARER_ICERA_H */
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c
index 52f8922d..730a79fb 100644
--- a/plugins/icera/mm-broadband-modem-icera.c
+++ b/plugins/icera/mm-broadband-modem-icera.c
@@ -401,7 +401,7 @@ typedef struct {
} BearerListReportStatusForeachContext;
static void
-bearer_list_report_status_foreach (MMBearer *bearer,
+bearer_list_report_status_foreach (MMBaseBearer *bearer,
BearerListReportStatusForeachContext *ctx)
{
if (mm_broadband_bearer_get_3gpp_cid (MM_BROADBAND_BEARER (bearer)) != ctx->cid)
@@ -410,7 +410,7 @@ bearer_list_report_status_foreach (MMBearer *bearer,
if (!MM_IS_BROADBAND_BEARER_ICERA (bearer))
return;
- mm_bearer_report_connection_status (bearer, ctx->status);
+ mm_base_bearer_report_connection_status (bearer, ctx->status);
}
static void
@@ -856,7 +856,7 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self,
/*****************************************************************************/
/* Create bearer (Modem interface) */
-static MMBearer *
+static MMBaseBearer *
modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
@@ -864,9 +864,9 @@ modem_create_bearer_finish (MMIfaceModem *self,
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
- return MM_BEARER (g_object_ref (
- g_simple_async_result_get_op_res_gpointer (
- G_SIMPLE_ASYNC_RESULT (res))));
+ return MM_BASE_BEARER (g_object_ref (
+ g_simple_async_result_get_op_res_gpointer (
+ G_SIMPLE_ASYNC_RESULT (res))));
}
static void
@@ -874,7 +874,7 @@ broadband_bearer_icera_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
- MMBearer *bearer = NULL;
+ MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_icera_new_finish (res, &error);
@@ -893,7 +893,7 @@ broadband_bearer_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
- MMBearer *bearer = NULL;
+ MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_new_finish (res, &error);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-13 21:24:38 +0000