diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-01 11:27:46 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 14:53:19 +0100 |
| commit | 323df60ed92d66e985a36a12fb334a0cca9bd1ea (patch) | |
| tree | a47944f0895600cde59bb034ebd8ce776a02d064 /src/mm-bearer.c | |
| parent | ef9fb0bfacac348c5bab35a3a99d52270e510d99 (diff) | |
libmm-common: `MMBearerIpConfig' won't be considered internal any more
Renamed `MMCommonBearerIpConfig' to `MMBearerIpConfig', and removed the
`MMBearerIpConfig' provided in libmm-glib. We'll just use the original one
from libmm-common always.
Diffstat (limited to 'src/mm-bearer.c')
| -rw-r--r-- | src/mm-bearer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mm-bearer.c b/src/mm-bearer.c index 68f45a62..358b0265 100644 --- a/src/mm-bearer.c +++ b/src/mm-bearer.c @@ -120,8 +120,8 @@ connect_ready (MMBearer *self, GError *error = NULL; gboolean launch_disconnect = FALSE; MMPort *data = NULL; - MMCommonBearerIpConfig *ipv4_config = NULL; - MMCommonBearerIpConfig *ipv6_config = NULL; + MMBearerIpConfig *ipv4_config = NULL; + MMBearerIpConfig *ipv6_config = NULL; /* NOTE: connect() implementations *MUST* handle cancellations themselves */ if (!MM_BEARER_GET_CLASS (self)->connect_finish (self, @@ -170,10 +170,10 @@ connect_ready (MMBearer *self, mm_gdbus_bearer_set_interface (MM_GDBUS_BEARER (self), mm_port_get_device (data)); mm_gdbus_bearer_set_ip4_config ( MM_GDBUS_BEARER (self), - mm_common_bearer_ip_config_get_dictionary (ipv4_config)); + mm_bearer_ip_config_get_dictionary (ipv4_config)); mm_gdbus_bearer_set_ip6_config ( MM_GDBUS_BEARER (self), - mm_common_bearer_ip_config_get_dictionary (ipv6_config)); + mm_bearer_ip_config_get_dictionary (ipv6_config)); g_clear_object (&data); g_clear_object (&ipv4_config); @@ -742,9 +742,9 @@ mm_bearer_init (MMBearer *self) mm_gdbus_bearer_set_properties (MM_GDBUS_BEARER (self), NULL); mm_gdbus_bearer_set_ip_timeout (MM_GDBUS_BEARER (self), MM_BEARER_IP_TIMEOUT_DEFAULT); mm_gdbus_bearer_set_ip4_config (MM_GDBUS_BEARER (self), - mm_common_bearer_ip_config_get_dictionary (NULL)); + mm_bearer_ip_config_get_dictionary (NULL)); mm_gdbus_bearer_set_ip6_config (MM_GDBUS_BEARER (self), - mm_common_bearer_ip_config_get_dictionary (NULL)); + mm_bearer_ip_config_get_dictionary (NULL)); } static void |