diff options
Diffstat (limited to 'plugins/iridium')
| -rw-r--r-- | plugins/iridium/mm-broadband-modem-iridium.c | 2 | ||||
| -rw-r--r-- | plugins/iridium/mm-sim-iridium.c | 28 | ||||
| -rw-r--r-- | plugins/iridium/mm-sim-iridium.h | 18 |
3 files changed, 24 insertions, 24 deletions
diff --git a/plugins/iridium/mm-broadband-modem-iridium.c b/plugins/iridium/mm-broadband-modem-iridium.c index 8000c5dd..c64e8d2d 100644 --- a/plugins/iridium/mm-broadband-modem-iridium.c +++ b/plugins/iridium/mm-broadband-modem-iridium.c @@ -257,7 +257,7 @@ load_supported_modes (MMIfaceModem *self, /*****************************************************************************/ /* Create SIM (Modem inteface) */ -static MMSim * +static MMBaseSim * create_sim_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) diff --git a/plugins/iridium/mm-sim-iridium.c b/plugins/iridium/mm-sim-iridium.c index 9d77d785..1240e6af 100644 --- a/plugins/iridium/mm-sim-iridium.c +++ b/plugins/iridium/mm-sim-iridium.c @@ -27,11 +27,11 @@ #include "mm-sim-iridium.h" -G_DEFINE_TYPE (MMSimIridium, mm_sim_iridium, MM_TYPE_SIM); +G_DEFINE_TYPE (MMSimIridium, mm_sim_iridium, MM_TYPE_BASE_SIM) /*****************************************************************************/ -MMSim * +MMBaseSim * mm_sim_iridium_new_finish (GAsyncResult *res, GError **error) { @@ -46,9 +46,9 @@ mm_sim_iridium_new_finish (GAsyncResult *res, return NULL; /* Only export valid SIMs */ - mm_sim_export (MM_SIM (sim)); + mm_base_sim_export (MM_BASE_SIM (sim)); - return MM_SIM (sim); + return MM_BASE_SIM (sim); } void @@ -62,7 +62,7 @@ mm_sim_iridium_new (MMBaseModem *modem, cancellable, callback, user_data, - MM_SIM_MODEM, modem, + MM_BASE_SIM_MODEM, modem, NULL); } @@ -74,15 +74,15 @@ mm_sim_iridium_init (MMSimIridium *self) static void mm_sim_iridium_class_init (MMSimIridiumClass *klass) { - MMSimClass *sim_class = MM_SIM_CLASS (klass); + MMBaseSimClass *base_sim_class = MM_BASE_SIM_CLASS (klass); /* Skip querying the SIM card info, not supported by Iridium modems */ - sim_class->load_sim_identifier = NULL; - sim_class->load_sim_identifier_finish = NULL; - sim_class->load_imsi = NULL; - sim_class->load_imsi_finish = NULL; - sim_class->load_operator_identifier = NULL; - sim_class->load_operator_identifier_finish = NULL; - sim_class->load_operator_name = NULL; - sim_class->load_operator_name_finish = NULL; + base_sim_class->load_sim_identifier = NULL; + base_sim_class->load_sim_identifier_finish = NULL; + base_sim_class->load_imsi = NULL; + base_sim_class->load_imsi_finish = NULL; + base_sim_class->load_operator_identifier = NULL; + base_sim_class->load_operator_identifier_finish = NULL; + base_sim_class->load_operator_name = NULL; + base_sim_class->load_operator_name_finish = NULL; } diff --git a/plugins/iridium/mm-sim-iridium.h b/plugins/iridium/mm-sim-iridium.h index 0150cb1e..2f3e2916 100644 --- a/plugins/iridium/mm-sim-iridium.h +++ b/plugins/iridium/mm-sim-iridium.h @@ -20,7 +20,7 @@ #include <glib.h> #include <glib-object.h> -#include "mm-sim.h" +#include "mm-base-sim.h" #define MM_TYPE_SIM_IRIDIUM (mm_sim_iridium_get_type ()) #define MM_SIM_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SIM_IRIDIUM, MMSimIridium)) @@ -33,20 +33,20 @@ typedef struct _MMSimIridium MMSimIridium; typedef struct _MMSimIridiumClass MMSimIridiumClass; struct _MMSimIridium { - MMSim parent; + MMBaseSim parent; }; struct _MMSimIridiumClass { - MMSimClass parent; + MMBaseSimClass parent; }; GType mm_sim_iridium_get_type (void); -void mm_sim_iridium_new (MMBaseModem *modem, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -MMSim *mm_sim_iridium_new_finish (GAsyncResult *res, - GError **error); +void mm_sim_iridium_new (MMBaseModem *modem, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +MMBaseSim *mm_sim_iridium_new_finish (GAsyncResult *res, + GError **error); #endif /* MM_SIM_IRIDIUM_H */ |