SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bearer: rename 'MMBearer' to 'MMBaseBearer'

Browse Source 
Just so that we don't have same header names in src/ and /libmm-glib.
This commit is contained in:
Aleksander Morgado
2014-07-06 16:55:29 +02:00
parent ff478e301e
commit 3ca267b01f
42 changed files with 553 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/altair/mm-broadband-bearer-altair-lte.c
+6 -6
View File
@@ -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);
}
plugins/altair/mm-broadband-bearer-altair-lte.h
+7 -9
View File
@@ -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 */
plugins/altair/mm-broadband-modem-altair-lte.c
+6 -6
View File
@@ -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);
}
/*****************************************************************************/
plugins/huawei/mm-broadband-bearer-huawei.c
+20 -20
View File
@@ -265,12 +265,12 @@ connect_3gpp_context_step (Connect3gppContext *ctx)
case CONNECT_3GPP_CONTEXT_STEP_FIRST: {
MMBearerIpFamily ip_family;
ip_family = mm_bearer_properties_get_ip_type (mm_bearer_peek_config (MM_BEARER (ctx->self)));
ip_family = mm_bearer_properties_get_ip_type (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
if (ip_family == MM_BEARER_IP_FAMILY_NONE ||
ip_family == MM_BEARER_IP_FAMILY_ANY) {
gchar *ip_family_str;
ip_family = mm_bearer_get_default_ip_family (MM_BEARER (ctx->self));
ip_family = mm_base_bearer_get_default_ip_family (MM_BASE_BEARER (ctx->self));
ip_family_str = mm_bearer_ip_family_build_string_from_mask (ip_family);
mm_dbg ("No specific IP family requested, defaulting to %s",
ip_family_str);
@@ -301,10 +301,10 @@ connect_3gpp_context_step (Connect3gppContext *ctx)
gint encoded_auth = MM_BEARER_HUAWEI_AUTH_UNKNOWN;
gchar *command;
apn = mm_bearer_properties_get_apn (mm_bearer_peek_config (MM_BEARER (ctx->self)));
user = mm_bearer_properties_get_user (mm_bearer_peek_config (MM_BEARER (ctx->self)));
passwd = mm_bearer_properties_get_password (mm_bearer_peek_config (MM_BEARER (ctx->self)));
auth = mm_bearer_properties_get_allowed_auth (mm_bearer_peek_config (MM_BEARER (ctx->self)));
apn = mm_bearer_properties_get_apn (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
user = mm_bearer_properties_get_user (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
passwd = mm_bearer_properties_get_password (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
auth = mm_bearer_properties_get_allowed_auth (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
encoded_auth = huawei_parse_auth_type (auth);
/* Default to no authentication if not specified */
@@ -700,16 +700,16 @@ static gboolean
network_disconnect_3gpp_delayed (MMBroadbandBearerHuawei *self)
{
mm_dbg ("Disconnect bearer '%s' on network request.",
mm_bearer_get_path (MM_BEARER (self)));
mm_base_bearer_get_path (MM_BASE_BEARER (self)));
self->priv->network_disconnect_pending_id = 0;
mm_bearer_report_connection_status (MM_BEARER (self),
MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
mm_base_bearer_report_connection_status (MM_BASE_BEARER (self),
MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
return FALSE;
}
static void
report_connection_status (MMBearer *bearer,
report_connection_status (MMBaseBearer *bearer,
MMBearerConnectionStatus status)
{
MMBroadbandBearerHuawei *self = MM_BROADBAND_BEARER_HUAWEI (bearer);
@@ -737,10 +737,10 @@ report_connection_status (MMBearer *bearer,
/* MM_BEARER_CONNECTION_STATUS_DISCONNECTING is used to indicate that the
* reporting of disconnection should be delayed. See MMBroadbandModemHuawei's
* bearer_report_connection_status for details. */
if (mm_bearer_get_status (bearer) == MM_BEARER_STATUS_CONNECTED &&
if (mm_base_bearer_get_status (bearer) == MM_BEARER_STATUS_CONNECTED &&
self->priv->network_disconnect_pending_id == 0) {
mm_dbg ("Delay network-initiated disconnection of bearer '%s'",
mm_bearer_get_path (MM_BEARER (self)));
mm_base_bearer_get_path (MM_BASE_BEARER (self)));
self->priv->network_disconnect_pending_id = (g_timeout_add_seconds (
4,
(GSourceFunc) network_disconnect_3gpp_delayed,
@@ -750,14 +750,14 @@ report_connection_status (MMBearer *bearer,
}
/* Report disconnected right away */
MM_BEARER_CLASS (mm_broadband_bearer_huawei_parent_class)->report_connection_status (
MM_BASE_BEARER_CLASS (mm_broadband_bearer_huawei_parent_class)->report_connection_status (
bearer,
MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
}
/*****************************************************************************/
MMBearer *
MMBaseBearer *
mm_broadband_bearer_huawei_new_finish (GAsyncResult *res,
GError **error)
{
@@ -772,9 +772,9 @@ mm_broadband_bearer_huawei_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);
}
static void
@@ -803,8 +803,8 @@ mm_broadband_bearer_huawei_new (MMBroadbandModemHuawei *modem,
cancellable,
callback,
user_data,
MM_BEARER_MODEM, modem,
MM_BEARER_CONFIG, config,
MM_BASE_BEARER_MODEM, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
@@ -821,13 +821,13 @@ static void
mm_broadband_bearer_huawei_class_init (MMBroadbandBearerHuaweiClass *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 (MMBroadbandBearerHuaweiPrivate));
object_class->dispose = dispose;
bearer_class->report_connection_status = report_connection_status;
base_bearer_class->report_connection_status = report_connection_status;
broadband_bearer_class->connect_3gpp = connect_3gpp;
broadband_bearer_class->connect_3gpp_finish = connect_3gpp_finish;
broadband_bearer_class->disconnect_3gpp = disconnect_3gpp;
plugins/huawei/mm-broadband-bearer-huawei.h
+7 -7
View File
@@ -48,12 +48,12 @@ struct _MMBroadbandBearerHuaweiClass {
GType mm_broadband_bearer_huawei_get_type (void);
void mm_broadband_bearer_huawei_new (MMBroadbandModemHuawei *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBearer *mm_broadband_bearer_huawei_new_finish (GAsyncResult *res,
GError **error);
void mm_broadband_bearer_huawei_new (MMBroadbandModemHuawei *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseBearer *mm_broadband_bearer_huawei_new_finish (GAsyncResult *res,
GError **error);
#endif /* MM_BROADBAND_BEARER_HUAWEI_H */
plugins/huawei/mm-broadband-modem-huawei.c
+10 -10
View File
@@ -1656,7 +1656,7 @@ typedef struct {
} NdisstatResult;
static void
bearer_report_connection_status (MMBearer *bearer,
bearer_report_connection_status (MMBaseBearer *bearer,
NdisstatResult *ndisstat_result)
{
if (ndisstat_result->ipv4_available) {
@@ -1665,10 +1665,10 @@ bearer_report_connection_status (MMBearer *bearer,
*
* Also, send DISCONNECTING so that we give some time before actually
* disconnecting the connection */
mm_bearer_report_connection_status (bearer,
ndisstat_result->ipv4_connected ?
MM_BEARER_CONNECTION_STATUS_CONNECTED :
MM_BEARER_CONNECTION_STATUS_DISCONNECTING);
mm_base_bearer_report_connection_status (bearer,
ndisstat_result->ipv4_connected ?
MM_BEARER_CONNECTION_STATUS_CONNECTED :
MM_BEARER_CONNECTION_STATUS_DISCONNECTING);
}
}
@@ -2059,18 +2059,18 @@ create_bearer_context_complete_and_free (CreateBearerContext *ctx)
g_slice_free (CreateBearerContext, ctx);
}
static MMBearer *
static MMBaseBearer *
huawei_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;
bearer = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
mm_dbg ("New huawei bearer created at DBus path '%s'", mm_bearer_get_path (bearer));
mm_dbg ("New huawei bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
}
@@ -2079,7 +2079,7 @@ broadband_bearer_huawei_new_ready (GObject *source,
GAsyncResult *res,
CreateBearerContext *ctx)
{
MMBearer *bearer;
MMBaseBearer *bearer;
GError *error = NULL;
bearer = mm_broadband_bearer_huawei_new_finish (res, &error);
@@ -2095,7 +2095,7 @@ broadband_bearer_new_ready (GObject *source,
GAsyncResult *res,
CreateBearerContext *ctx)
{
MMBearer *bearer;
MMBaseBearer *bearer;
GError *error = NULL;
bearer = mm_broadband_bearer_new_finish (res, &error);
plugins/icera/mm-broadband-bearer-icera.c
+14 -14
View File
@@ -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;
plugins/icera/mm-broadband-bearer-icera.h
+8 -8
View File
@@ -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 */
plugins/icera/mm-broadband-modem-icera.c
+8 -8
View File
@@ -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);
plugins/iridium/mm-bearer-iridium.c
+15 -15
View File
@@ -29,9 +29,9 @@
#include "mm-log.h"
/* Allow up to 200s to get a proper IP connection */
#define MM_BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT 200
#define BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT 200
G_DEFINE_TYPE (MMBearerIridium, mm_bearer_iridium, MM_TYPE_BEARER);
G_DEFINE_TYPE (MMBearerIridium, mm_bearer_iridium, MM_TYPE_BASE_BEARER);
/*****************************************************************************/
/* Connect */
@@ -59,7 +59,7 @@ connect_context_complete_and_free (ConnectContext *ctx)
}
static MMBearerConnectResult *
connect_finish (MMBearer *self,
connect_finish (MMBaseBearer *self,
GAsyncResult *res,
GError **error)
{
@@ -192,7 +192,7 @@ service_type_ready (MMBaseModem *modem,
}
static void
connect (MMBearer *self,
connect (MMBaseBearer *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -201,7 +201,7 @@ connect (MMBearer *self,
MMBaseModem *modem = NULL;
g_object_get (self,
MM_BEARER_MODEM, &modem,
MM_BASE_BEARER_MODEM, &modem,
NULL);
g_assert (modem);
@@ -236,23 +236,23 @@ connect (MMBearer *self,
/*****************************************************************************/
MMBearer *
MMBaseBearer *
mm_bearer_iridium_new (MMBroadbandModemIridium *modem,
MMBearerProperties *config)
{
MMBearer *bearer;
MMBaseBearer *bearer;
/* The Iridium bearer inherits from MMBearer (so it's not a MMBroadbandBearer)
/* The Iridium bearer inherits from MMBaseBearer (so it's not a MMBroadbandBearer)
* and that means that the object is not async-initable, so we just use
* g_object_get() here */
bearer = g_object_new (MM_TYPE_BEARER_IRIDIUM,
MM_BEARER_MODEM, modem,
MM_BEARER_CONFIG, config,
"ip-timeout", MM_BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT,
MM_BASE_BEARER_MODEM, modem,
MM_BASE_BEARER_CONFIG, config,
"ip-timeout", BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT,
NULL);
/* Only export valid bearers */
mm_bearer_export (bearer);
mm_base_bearer_export (bearer);
return bearer;
}
@@ -265,9 +265,9 @@ mm_bearer_iridium_init (MMBearerIridium *self)
static void
mm_bearer_iridium_class_init (MMBearerIridiumClass *klass)
{
MMBearerClass *bearer_class = MM_BEARER_CLASS (klass);
MMBaseBearerClass *base_bearer_class = MM_BASE_BEARER_CLASS (klass);
/* Virtual methods */
bearer_class->connect = connect;
bearer_class->connect_finish = connect_finish;
base_bearer_class->connect = connect;
base_bearer_class->connect_finish = connect_finish;
}
plugins/iridium/mm-bearer-iridium.h
+5 -5
View File
@@ -24,7 +24,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-broadband-bearer.h"
#include "mm-base-bearer.h"
#include "mm-broadband-modem-iridium.h"
#define MM_TYPE_BEARER_IRIDIUM (mm_bearer_iridium_get_type ())
@@ -38,18 +38,18 @@ typedef struct _MMBearerIridium MMBearerIridium;
typedef struct _MMBearerIridiumClass MMBearerIridiumClass;
struct _MMBearerIridium {
MMBearer parent;
MMBaseBearer parent;
};
struct _MMBearerIridiumClass {
MMBearerClass parent;
MMBaseBearerClass parent;
};
GType mm_bearer_iridium_get_type (void);
/* Iridium bearer creation implementation.
* NOTE it is *not* a broadband bearer, so not async-initable */
MMBearer *mm_bearer_iridium_new (MMBroadbandModemIridium *modem,
MMBearerProperties *config);
MMBaseBearer *mm_bearer_iridium_new (MMBroadbandModemIridium *modem,
MMBearerProperties *config);
#endif /* MM_BEARER_IRIDIUM_H */
plugins/iridium/mm-broadband-modem-iridium.c
+4 -4
View File
@@ -280,15 +280,15 @@ create_sim (MMIfaceModem *self,
/*****************************************************************************/
/* Create Bearer (Modem interface) */
static MMBearer *
static MMBaseBearer *
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 Iridium bearer created at DBus path '%s'", mm_bearer_get_path (bearer));
mm_dbg ("New Iridium bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
}
@@ -299,7 +299,7 @@ create_bearer (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
MMBearer *bearer;
MMBaseBearer *bearer;
GSimpleAsyncResult *result;
result = g_simple_async_result_new (G_OBJECT (self),
plugins/mbm/mm-broadband-bearer-mbm.c
+11 -11
View File
@@ -117,7 +117,7 @@ dial_3gpp_finish (MMBroadbandBearer *self,
}
static void
report_connection_status (MMBearer *bearer,
report_connection_status (MMBaseBearer *bearer,
MMBearerConnectionStatus status)
{
MMBroadbandBearerMbm *self = MM_BROADBAND_BEARER_MBM (bearer);
@@ -140,7 +140,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_mbm_parent_class)->report_connection_status (
MM_BASE_BEARER_CLASS (mm_broadband_bearer_mbm_parent_class)->report_connection_status (
bearer,
status);
}
@@ -388,8 +388,8 @@ authenticate (Dial3gppContext *ctx)
const gchar *user;
const gchar *password;
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)));
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)));
/* Both user and password are required; otherwise firmware returns an error */
if (user || password) {
@@ -707,7 +707,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
/*****************************************************************************/
MMBearer *
MMBaseBearer *
mm_broadband_bearer_mbm_new_finish (GAsyncResult *res,
GError **error)
{
@@ -722,9 +722,9 @@ mm_broadband_bearer_mbm_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
@@ -740,8 +740,8 @@ mm_broadband_bearer_mbm_new (MMBroadbandModemMbm *modem,
cancellable,
callback,
user_data,
MM_BEARER_MODEM, modem,
MM_BEARER_CONFIG, config,
MM_BASE_BEARER_MODEM, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
@@ -759,12 +759,12 @@ mm_broadband_bearer_mbm_class_init (MMBroadbandBearerMbmClass *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 (MMBroadbandBearerMbmPrivate));
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;
plugins/mbm/mm-broadband-bearer-mbm.h
+7 -7
View File
@@ -57,12 +57,12 @@ struct _MMBroadbandBearerMbmClass {
GType mm_broadband_bearer_mbm_get_type (void);
/* Default 3GPP bearer creation implementation */
void mm_broadband_bearer_mbm_new (MMBroadbandModemMbm *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBearer *mm_broadband_bearer_mbm_new_finish (GAsyncResult *res,
GError **error);
void mm_broadband_bearer_mbm_new (MMBroadbandModemMbm *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseBearer *mm_broadband_bearer_mbm_new_finish (GAsyncResult *res,
GError **error);
#endif /* MM_BROADBAND_BEARER_MBM_H */
plugins/mbm/mm-broadband-modem-mbm.c
+6 -6
View File
@@ -80,15 +80,15 @@ struct _MMBroadbandModemMbmPrivate {
/*****************************************************************************/
/* 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 MBM bearer created at DBus path '%s'", mm_bearer_get_path (bearer));
mm_dbg ("New MBM bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
}
@@ -98,7 +98,7 @@ broadband_bearer_mbm_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
MMBearer *bearer = NULL;
MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_mbm_new_finish (res, &error);
@@ -801,10 +801,10 @@ typedef struct {
} BearerListReportStatusForeachContext;
static void
bearer_list_report_status_foreach (MMBearer *bearer,
bearer_list_report_status_foreach (MMBaseBearer *bearer,
BearerListReportStatusForeachContext *ctx)
{
mm_bearer_report_connection_status (bearer, ctx->status);
mm_base_bearer_report_connection_status (bearer, ctx->status);
}
static void
plugins/novatel/mm-broadband-bearer-novatel-lte.c
+10 -10
View File
@@ -138,7 +138,7 @@ poll_connection_ready (MMBaseModem *modem,
}
if (is_qmistatus_disconnected (result)) {
mm_bearer_report_connection_status (MM_BEARER (bearer), MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
mm_base_bearer_report_connection_status (MM_BASE_BEARER (bearer), MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
g_source_remove (bearer->priv->connection_poller);
bearer->priv->connection_poller = 0;
}
@@ -149,8 +149,8 @@ poll_connection (MMBroadbandBearerNovatelLte *bearer)
{
MMBaseModem *modem = NULL;
g_object_get (MM_BEARER (bearer),
MM_BEARER_MODEM, &modem,
g_object_get (MM_BASE_BEARER (bearer),
MM_BASE_BEARER_MODEM, &modem,
NULL);
mm_base_modem_at_command (
modem,
@@ -282,7 +282,7 @@ connect_3gpp_authenticate (DetailedConnectContext *ctx)
MMBearerProperties *config;
gchar *command, *apn, *user, *password;
config = mm_bearer_peek_config (MM_BEARER (ctx->self));
config = mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self));
apn = mm_port_serial_at_quote_string (mm_bearer_properties_get_apn (config));
user = mm_port_serial_at_quote_string (mm_bearer_properties_get_user (config));
password = mm_port_serial_at_quote_string (mm_bearer_properties_get_password (config));
@@ -517,7 +517,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
/*****************************************************************************/
MMBearer *
MMBaseBearer *
mm_broadband_bearer_novatel_lte_new_finish (GAsyncResult *res,
GError **error)
{
@@ -532,9 +532,9 @@ mm_broadband_bearer_novatel_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
@@ -550,15 +550,15 @@ mm_broadband_bearer_novatel_lte_new (MMBroadbandModemNovatelLte *modem,
cancellable,
callback,
user_data,
MM_BEARER_MODEM, modem,
MM_BEARER_CONFIG, config,
MM_BASE_BEARER_MODEM, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
static void
mm_broadband_bearer_novatel_lte_init (MMBroadbandBearerNovatelLte *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE,
MMBroadbandBearerNovatelLtePrivate);
plugins/novatel/mm-broadband-bearer-novatel-lte.h
+7 -7
View File
@@ -50,13 +50,13 @@ struct _MMBroadbandBearerNovatelLteClass {
GType mm_broadband_bearer_novatel_lte_get_type (void);
/* Default 3GPP bearer creation implementation */
void mm_broadband_bearer_novatel_lte_new (MMBroadbandModemNovatelLte *modem,
MMBearerProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBearer *mm_broadband_bearer_novatel_lte_new_finish (GAsyncResult *res,
GError **error);
void mm_broadband_bearer_novatel_lte_new (MMBroadbandModemNovatelLte *modem,
MMBearerProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseBearer *mm_broadband_bearer_novatel_lte_new_finish (GAsyncResult *res,
GError **error);
#endif /* MM_BROADBAND_BEARER_NOVATEL_LTE_H */
plugins/novatel/mm-broadband-modem-novatel-lte.c
+3 -3
View File
@@ -69,12 +69,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;
@@ -89,7 +89,7 @@ broadband_bearer_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
MMBearer *bearer = NULL;
MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_novatel_lte_new_finish (res, &error);
plugins/option/mm-broadband-bearer-hso.c
+14 -14
View File
@@ -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;
plugins/option/mm-broadband-bearer-hso.h
+7 -7
View File
@@ -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 */
plugins/option/mm-broadband-modem-hso.c
+7 -7
View File
@@ -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
plugins/sierra/mm-broadband-bearer-sierra.c
+8 -8
View File
@@ -202,9 +202,9 @@ dial_3gpp_context_step (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)));
if (!user || !password || allowed_auth == MM_BEARER_ALLOWED_AUTH_NONE) {
mm_dbg ("Not using authentication");
@@ -445,7 +445,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
#define MM_BROADBAND_BEARER_SIERRA_IS_ICERA "is-icera"
MMBearer *
MMBaseBearer *
mm_broadband_bearer_sierra_new_finish (GAsyncResult *res,
GError **error)
{
@@ -460,9 +460,9 @@ mm_broadband_bearer_sierra_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
@@ -479,8 +479,8 @@ mm_broadband_bearer_sierra_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_SIERRA_IS_ICERA, is_icera,
NULL);
}
plugins/sierra/mm-broadband-bearer-sierra.h
+8 -8
View File
@@ -50,13 +50,13 @@ struct _MMBroadbandBearerSierraClass {
GType mm_broadband_bearer_sierra_get_type (void);
/* Default 3GPP bearer creation implementation */
void mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
MMBearerProperties *config,
gboolean is_icera,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBearer *mm_broadband_bearer_sierra_new_finish (GAsyncResult *res,
GError **error);
void mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
MMBearerProperties *config,
gboolean is_icera,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseBearer *mm_broadband_bearer_sierra_new_finish (GAsyncResult *res,
GError **error);
#endif /* MM_BROADBAND_BEARER_SIERRA_H */
plugins/sierra/mm-broadband-modem-sierra-icera.c
+4 -4
View File
@@ -39,15 +39,15 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSierraIcera, mm_broadband_modem_sierra_i
/*****************************************************************************/
/* 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 Sierra bearer created at DBus path '%s'", mm_bearer_get_path (bearer));
mm_dbg ("New Sierra bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
}
@@ -57,7 +57,7 @@ broadband_bearer_sierra_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
MMBearer *bearer = NULL;
MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_sierra_new_finish (res, &error);
plugins/sierra/mm-broadband-modem-sierra.c
+4 -4
View File
@@ -1088,15 +1088,15 @@ modem_load_own_numbers (MMIfaceModem *self,
/*****************************************************************************/
/* 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 Sierra bearer created at DBus path '%s'", mm_bearer_get_path (bearer));
mm_dbg ("New Sierra bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
}
@@ -1106,7 +1106,7 @@ broadband_bearer_sierra_new_ready (GObject *source,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
MMBearer *bearer = NULL;
MMBaseBearer *bearer = NULL;
GError *error = NULL;
bearer = mm_broadband_bearer_sierra_new_finish (res, &error);