diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/iridium/mm-bearer-iridium.c | 12 | ||||
-rw-r--r-- | plugins/iridium/mm-broadband-modem-iridium.c | 2 | ||||
-rw-r--r-- | plugins/novatel/mm-broadband-bearer-novatel.c | 2 | ||||
-rw-r--r-- | plugins/novatel/mm-broadband-bearer-novatel.h | 10 | ||||
-rw-r--r-- | plugins/novatel/mm-broadband-modem-novatel.c | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c index 43b19a23..7811fe90 100644 --- a/plugins/iridium/mm-bearer-iridium.c +++ b/plugins/iridium/mm-bearer-iridium.c @@ -378,13 +378,13 @@ disconnect (MMBearer *self, static gboolean cmp_properties (MMBearer *self, - MMCommonBearerProperties *properties) + MMBearerProperties *properties) { - return (mm_common_bearer_properties_get_apn (properties) == NULL && - mm_common_bearer_properties_get_ip_type (properties) == NULL && - mm_common_bearer_properties_get_number (properties) == NULL && - mm_common_bearer_properties_get_rm_protocol (properties) == MM_MODEM_CDMA_RM_PROTOCOL_UNKNOWN && - mm_common_bearer_properties_get_allow_roaming (properties)); + return (mm_bearer_properties_get_apn (properties) == NULL && + mm_bearer_properties_get_ip_type (properties) == NULL && + mm_bearer_properties_get_number (properties) == NULL && + mm_bearer_properties_get_rm_protocol (properties) == MM_MODEM_CDMA_RM_PROTOCOL_UNKNOWN && + mm_bearer_properties_get_allow_roaming (properties)); } /*****************************************************************************/ diff --git a/plugins/iridium/mm-broadband-modem-iridium.c b/plugins/iridium/mm-broadband-modem-iridium.c index bb5cdc47..8ae7a8fc 100644 --- a/plugins/iridium/mm-broadband-modem-iridium.c +++ b/plugins/iridium/mm-broadband-modem-iridium.c @@ -354,7 +354,7 @@ create_bearer_finish (MMIfaceModem *self, static void create_bearer (MMIfaceModem *self, - MMCommonBearerProperties *properties, + MMBearerProperties *properties, GAsyncReadyCallback callback, gpointer user_data) { diff --git a/plugins/novatel/mm-broadband-bearer-novatel.c b/plugins/novatel/mm-broadband-bearer-novatel.c index 7abac790..e480114a 100644 --- a/plugins/novatel/mm-broadband-bearer-novatel.c +++ b/plugins/novatel/mm-broadband-bearer-novatel.c @@ -406,7 +406,7 @@ mm_broadband_bearer_novatel_new_finish (GAsyncResult *res, } void mm_broadband_bearer_novatel_new (MMBroadbandModemNovatel *modem, - MMCommonBearerProperties *properties, + MMBearerProperties *properties, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) diff --git a/plugins/novatel/mm-broadband-bearer-novatel.h b/plugins/novatel/mm-broadband-bearer-novatel.h index 228362e0..bae9497a 100644 --- a/plugins/novatel/mm-broadband-bearer-novatel.h +++ b/plugins/novatel/mm-broadband-bearer-novatel.h @@ -49,12 +49,12 @@ GType mm_broadband_bearer_novatel_get_type (void); /* Default 3GPP bearer creation implementation */ void mm_broadband_bearer_novatel_new (MMBroadbandModemNovatel *modem, - MMCommonBearerProperties *properties, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + MMBearerProperties *properties, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); MMBearer *mm_broadband_bearer_novatel_new_finish (GAsyncResult *res, - GError **error); + GError **error); #endif /* MM_BROADBAND_BEARER_NOVATEL_H */ diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel.c index 8135c306..7fbc8346 100644 --- a/plugins/novatel/mm-broadband-modem-novatel.c +++ b/plugins/novatel/mm-broadband-modem-novatel.c @@ -72,7 +72,7 @@ broadband_bearer_new_ready (GObject *source, static void modem_create_bearer (MMIfaceModem *self, - MMCommonBearerProperties *properties, + MMBearerProperties *properties, GAsyncReadyCallback callback, gpointer user_data) { |