diff options
Diffstat (limited to 'plugins/sierra')
| -rw-r--r-- | plugins/sierra/mm-broadband-bearer-sierra.c | 16 | ||||
| -rw-r--r-- | plugins/sierra/mm-broadband-bearer-sierra.h | 16 | ||||
| -rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra-icera.c | 8 | ||||
| -rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra.c | 8 |
4 files changed, 24 insertions, 24 deletions
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c index b4bfe109..0d872199 100644 --- a/plugins/sierra/mm-broadband-bearer-sierra.c +++ b/plugins/sierra/mm-broadband-bearer-sierra.c @@ -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); } diff --git a/plugins/sierra/mm-broadband-bearer-sierra.h b/plugins/sierra/mm-broadband-bearer-sierra.h index fea7b94f..9f75685e 100644 --- a/plugins/sierra/mm-broadband-bearer-sierra.h +++ b/plugins/sierra/mm-broadband-bearer-sierra.h @@ -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 */ diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.c b/plugins/sierra/mm-broadband-modem-sierra-icera.c index 3bfad984..bd01cc4d 100644 --- a/plugins/sierra/mm-broadband-modem-sierra-icera.c +++ b/plugins/sierra/mm-broadband-modem-sierra-icera.c @@ -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); diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c index d6dd965b..c0307458 100644 --- a/plugins/sierra/mm-broadband-modem-sierra.c +++ b/plugins/sierra/mm-broadband-modem-sierra.c @@ -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); |