diff options
Diffstat (limited to 'plugins/iridium')
| -rw-r--r-- | plugins/iridium/mm-bearer-iridium.c | 30 | ||||
| -rw-r--r-- | plugins/iridium/mm-bearer-iridium.h | 10 | ||||
| -rw-r--r-- | plugins/iridium/mm-broadband-modem-iridium.c | 8 |
3 files changed, 24 insertions, 24 deletions
diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c index 9a93b07e..fd54647d 100644 --- a/plugins/iridium/mm-bearer-iridium.c +++ b/plugins/iridium/mm-bearer-iridium.c @@ -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; } diff --git a/plugins/iridium/mm-bearer-iridium.h b/plugins/iridium/mm-bearer-iridium.h index 3b2b06d2..eba6ac54 100644 --- a/plugins/iridium/mm-bearer-iridium.h +++ b/plugins/iridium/mm-bearer-iridium.h @@ -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 */ diff --git a/plugins/iridium/mm-broadband-modem-iridium.c b/plugins/iridium/mm-broadband-modem-iridium.c index 5f46b4cb..8000c5dd 100644 --- a/plugins/iridium/mm-broadband-modem-iridium.c +++ b/plugins/iridium/mm-broadband-modem-iridium.c @@ -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), |