aboutsummaryrefslogtreecommitdiff
path: root/plugins/option
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/option')
-rw-r--r--plugins/option/mm-broadband-bearer-hso.c28
-rw-r--r--plugins/option/mm-broadband-bearer-hso.h14
-rw-r--r--plugins/option/mm-broadband-modem-hso.c14
3 files changed, 28 insertions, 28 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;
diff --git a/plugins/option/mm-broadband-bearer-hso.h b/plugins/option/mm-broadband-bearer-hso.h
index 20b89db7..7812d74d 100644
--- a/plugins/option/mm-broadband-bearer-hso.h
+++ b/plugins/option/mm-broadband-bearer-hso.h
@@ -48,12 +48,12 @@ struct _MMBroadbandBearerHsoClass {
GType mm_broadband_bearer_hso_get_type (void);
/* Default 3GPP bearer creation implementation */
-void mm_broadband_bearer_hso_new (MMBroadbandModemHso *modem,
- MMBearerProperties *config,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-MMBearer *mm_broadband_bearer_hso_new_finish (GAsyncResult *res,
- GError **error);
+void mm_broadband_bearer_hso_new (MMBroadbandModemHso *modem,
+ MMBearerProperties *config,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+MMBaseBearer *mm_broadband_bearer_hso_new_finish (GAsyncResult *res,
+ GError **error);
#endif /* MM_BROADBAND_BEARER_HSO_H */
diff --git a/plugins/option/mm-broadband-modem-hso.c b/plugins/option/mm-broadband-modem-hso.c
index b8272529..d2d46891 100644
--- a/plugins/option/mm-broadband-modem-hso.c
+++ b/plugins/option/mm-broadband-modem-hso.c
@@ -57,17 +57,17 @@ struct _MMBroadbandModemHsoPrivate {
/*****************************************************************************/
/* Create Bearer (Modem interface) */
-static MMBearer *
+static MMBaseBearer *
modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
- MMBearer *bearer;
+ MMBaseBearer *bearer;
bearer = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
mm_dbg ("New %s bearer created at DBus path '%s'",
MM_IS_BROADBAND_BEARER_HSO (bearer) ? "HSO" : "Generic",
- mm_bearer_get_path (bearer));
+ mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
}
@@ -77,7 +77,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);
@@ -96,7 +96,7 @@ broadband_bearer_hso_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
- MMBearer *bearer = NULL;
+ MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_hso_new_finish (res, &error);
@@ -220,13 +220,13 @@ 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)
return;
- mm_bearer_report_connection_status (MM_BEARER (bearer), ctx->status);
+ mm_base_bearer_report_connection_status (MM_BASE_BEARER (bearer), ctx->status);
}
static void
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-11 09:10:25 +0000