diff options
Diffstat (limited to 'plugins/iridium')
| -rw-r--r-- | plugins/iridium/mm-bearer-iridium.c | 18 | ||||
| -rw-r--r-- | plugins/iridium/mm-bearer-iridium.h | 3 | ||||
| -rw-r--r-- | plugins/iridium/mm-broadband-modem-iridium.c | 5 |
3 files changed, 7 insertions, 19 deletions
diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c index 1caa68e1..93936c22 100644 --- a/plugins/iridium/mm-bearer-iridium.c +++ b/plugins/iridium/mm-bearer-iridium.c @@ -385,21 +385,9 @@ disconnect (MMBearer *self, /*****************************************************************************/ -static gboolean -cmp_properties (MMBearer *self, - MMBearerProperties *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)); -} - -/*****************************************************************************/ - MMBearer * -mm_bearer_iridium_new (MMBroadbandModemIridium *modem) +mm_bearer_iridium_new (MMBroadbandModemIridium *modem, + MMBearerProperties *config) { MMBearer *bearer; @@ -408,6 +396,7 @@ mm_bearer_iridium_new (MMBroadbandModemIridium *modem) * 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, NULL); @@ -428,7 +417,6 @@ mm_bearer_iridium_class_init (MMBearerIridiumClass *klass) MMBearerClass *bearer_class = MM_BEARER_CLASS (klass); /* Virtual methods */ - bearer_class->cmp_properties = cmp_properties; bearer_class->connect = connect; bearer_class->connect_finish = connect_finish; bearer_class->disconnect = disconnect; diff --git a/plugins/iridium/mm-bearer-iridium.h b/plugins/iridium/mm-bearer-iridium.h index ccb33072..191de0f8 100644 --- a/plugins/iridium/mm-bearer-iridium.h +++ b/plugins/iridium/mm-bearer-iridium.h @@ -48,6 +48,7 @@ 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); +MMBearer *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 4ea8f06e..1235ed28 100644 --- a/plugins/iridium/mm-broadband-modem-iridium.c +++ b/plugins/iridium/mm-broadband-modem-iridium.c @@ -360,10 +360,9 @@ create_bearer (MMIfaceModem *self, callback, user_data, create_bearer); - /* We just create a MMBearerIridium - * Note that we do not need to use properties here */ mm_dbg ("Creating Iridium bearer..."); - bearer = mm_bearer_iridium_new (MM_BROADBAND_MODEM_IRIDIUM (self)); + bearer = mm_bearer_iridium_new (MM_BROADBAND_MODEM_IRIDIUM (self), + properties); g_simple_async_result_set_op_res_gpointer (result, bearer, (GDestroyNotify)g_object_unref); |