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
plugins/iridium/mm-bearer-iridium.c
+7 -7
View File
@@ -38,8 +38,8 @@ G_DEFINE_TYPE (MMBearerIridium, mm_bearer_iridium, MM_TYPE_BEARER);
typedef struct {
MMPort *data;
MMCommonBearerIpConfig *ipv4_config;
MMCommonBearerIpConfig *ipv6_config;
MMBearerIpConfig *ipv4_config;
MMBearerIpConfig *ipv6_config;
} ConnectResult;
static void
@@ -76,8 +76,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;
@@ -137,7 +137,7 @@ dial_ready (MMBaseModem *modem,
GAsyncResult *res,
ConnectContext *ctx)
{
MMCommonBearerIpConfig *config;
MMBearerIpConfig *config;
ConnectResult *result;
/* DO NOT check for cancellable here. If we got here without errors, the
@@ -161,8 +161,8 @@ dial_ready (MMBaseModem *modem,
mm_port_set_connected (MM_PORT (mm_base_modem_get_port_primary (modem)), TRUE);
/* Build IP config; always PPP based */
config = mm_common_bearer_ip_config_new ();
mm_common_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_PPP);
config = mm_bearer_ip_config_new ();
mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_PPP);
/* Build result */
result = g_new0 (ConnectResult, 1);
plugins/novatel/mm-broadband-bearer-novatel.c
+7 -7
View File
@@ -90,10 +90,10 @@ detailed_connect_context_complete_and_free (DetailedConnectContext *ctx)
static void
detailed_connect_context_complete_and_free_successful (DetailedConnectContext *ctx)
{
MMCommonBearerIpConfig *config;
MMBearerIpConfig *config;
config = mm_common_bearer_ip_config_new ();
mm_common_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_DHCP);
config = mm_bearer_ip_config_new ();
mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_DHCP);
g_simple_async_result_set_op_res_gpointer (ctx->result,
config,
(GDestroyNotify)g_object_unref);
@@ -104,11 +104,11 @@ detailed_connect_context_complete_and_free_successful (DetailedConnectContext *c
static gboolean
connect_3gpp_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;
@@ -150,7 +150,7 @@ connect_3gpp_qmistatus_ready (MMBaseModem *modem,
mm_dbg("Error: '%s'", result);
if (ctx->retries > 0) {
ctx->retries--;
mm_dbg("Retrying status check in a second. %d retries left.",
mm_dbg("Retrying status check in a second. %d retries left.",
ctx->retries);
g_timeout_add_seconds(1, (GSourceFunc)connect_3gpp_qmistatus, ctx);
return;