libmm-common: `MMBearerProperties' won't be considered internal any more
Renamed `MMCommonBearerProperties' to `MMBearerProperties', and removed the `MMBearerProperties' provided in libmm-glib. We'll just use the original one from libmm-common always.
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@@ -354,7 +354,7 @@ create_bearer_finish (MMIfaceModem *self,
|
||||
|
||||
static void
|
||||
create_bearer (MMIfaceModem *self,
|
||||
MMCommonBearerProperties *properties,
|
||||
MMBearerProperties *properties,
|
||||
GAsyncReadyCallback callback,
|
||||
gpointer user_data)
|
||||
{
|
||||
|
@@ -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)
|
||||
|
@@ -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 */
|
||||
|
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user