SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmm-common: `MMBearerIpConfig' won't be considered internal any more

Browse Source 
Renamed `MMCommonBearerIpConfig' to `MMBearerIpConfig', and removed the
`MMBearerIpConfig' provided in libmm-glib. We'll just use the original one
from libmm-common always.
This commit is contained in:
Aleksander Morgado
2012-03-16 14:53:19 +01:00
parent ef9fb0bfac
commit 323df60ed9
16 changed files with 205 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-bearer.c
+6 -6
View File
@@ -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
src/mm-bearer.h
+2 -2
View File
@@ -64,8 +64,8 @@ struct _MMBearerClass {
gboolean (* connect_finish) (MMBearer *bearer,
GAsyncResult *res,
MMPort **data,
MMCommonBearerIpConfig **ipv4_config,
MMCommonBearerIpConfig **ipv6_config,
MMBearerIpConfig **ipv4_config,
MMBearerIpConfig **ipv6_config,
GError **error);
/* Disconnect this bearer */
src/mm-broadband-bearer.c
+19 -19
View File
@@ -150,11 +150,11 @@ typedef struct {
static gboolean
detailed_connect_finish (MMBroadbandBearer *self,
GAsyncResult *res,
MMCommonBearerIpConfig **ipv4_config,
MMCommonBearerIpConfig **ipv6_config,
MMBearerIpConfig **ipv4_config,
MMBearerIpConfig **ipv6_config,
GError **error)
{
MMCommonBearerIpConfig *config;
MMBearerIpConfig *config;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return FALSE;
@@ -183,14 +183,14 @@ detailed_connect_context_complete_and_free (DetailedConnectContext *ctx)
static void
detailed_connect_context_complete_and_free_successful (DetailedConnectContext *ctx)
{
MMCommonBearerIpConfig *config;
MMBearerIpConfig *config;
/* If serial port, set PPP method. Otherwise, assume DHCP is needed. */
config = mm_common_bearer_ip_config_new ();
mm_common_bearer_ip_config_set_method (config,
(MM_IS_AT_SERIAL_PORT (ctx->data) ?
MM_BEARER_IP_METHOD_PPP :
MM_BEARER_IP_METHOD_DHCP));
config = mm_bearer_ip_config_new ();
mm_bearer_ip_config_set_method (config,
(MM_IS_AT_SERIAL_PORT (ctx->data) ?
MM_BEARER_IP_METHOD_PPP :
MM_BEARER_IP_METHOD_DHCP));
g_simple_async_result_set_op_res_gpointer (ctx->result,
config,
(GDestroyNotify)g_object_unref);
@@ -924,8 +924,8 @@ connect_3gpp (MMBroadbandBearer *self,
typedef struct {
MMPort *data;
MMCommonBearerIpConfig *ipv4_config;
MMCommonBearerIpConfig *ipv6_config;
MMBearerIpConfig *ipv4_config;
MMBearerIpConfig *ipv6_config;
} ConnectResult;
static void
@@ -959,8 +959,8 @@ static gboolean
connect_finish (MMBearer *self,
GAsyncResult *res,
MMPort **data,
MMCommonBearerIpConfig **ipv4_config,
MMCommonBearerIpConfig **ipv6_config,
MMBearerIpConfig **ipv4_config,
MMBearerIpConfig **ipv6_config,
GError **error)
{
ConnectResult *result;
@@ -979,8 +979,8 @@ connect_finish (MMBearer *self,
static void
connect_succeeded (ConnectContext *ctx,
ConnectionType connection_type,
MMCommonBearerIpConfig *ipv4_config,
MMCommonBearerIpConfig *ipv6_config)
MMBearerIpConfig *ipv4_config,
MMBearerIpConfig *ipv6_config)
{
ConnectResult *result;
@@ -1023,8 +1023,8 @@ connect_cdma_ready (MMBroadbandBearer *self,
ConnectContext *ctx)
{
GError *error = NULL;
MMCommonBearerIpConfig *ipv4_config = NULL;
MMCommonBearerIpConfig *ipv6_config = NULL;
MMBearerIpConfig *ipv4_config = NULL;
MMBearerIpConfig *ipv6_config = NULL;
if (!MM_BROADBAND_BEARER_GET_CLASS (self)->connect_cdma_finish (self,
res,
@@ -1042,8 +1042,8 @@ connect_3gpp_ready (MMBroadbandBearer *self,
ConnectContext *ctx)
{
GError *error = NULL;
MMCommonBearerIpConfig *ipv4_config = NULL;
MMCommonBearerIpConfig *ipv6_config = NULL;
MMBearerIpConfig *ipv4_config = NULL;
MMBearerIpConfig *ipv6_config = NULL;
if (!MM_BROADBAND_BEARER_GET_CLASS (self)->connect_3gpp_finish (self,
res,
src/mm-broadband-bearer.h
+4 -4
View File
@@ -62,8 +62,8 @@ struct _MMBroadbandBearerClass {
gpointer user_data);
gboolean (* connect_3gpp_finish) (MMBroadbandBearer *self,
GAsyncResult *res,
MMCommonBearerIpConfig **ipv4_config,
MMCommonBearerIpConfig **ipv6_config,
MMBearerIpConfig **ipv4_config,
MMBearerIpConfig **ipv6_config,
GError **error);
/* Dialing sub-part of 3GPP connection */
@@ -101,8 +101,8 @@ struct _MMBroadbandBearerClass {
gpointer user_data);
gboolean (* connect_cdma_finish) (MMBroadbandBearer *self,
GAsyncResult *res,
MMCommonBearerIpConfig **ipv4_config,
MMCommonBearerIpConfig **ipv6_config,
MMBearerIpConfig **ipv4_config,
MMBearerIpConfig **ipv6_config,
GError **error);
/* Full CDMA disconnection sequence */