From cf2d450a89a756d123f7430e866a21b5d3e706cd Mon Sep 17 00:00:00 2001 From: Henri Bragge Date: Wed, 2 Mar 2011 16:42:04 +0100 Subject: [PATCH] ofono: Do not connect autonomously activated contexts When activated context is found, do not connect to it unless requested to do so. --- plugins/ofono.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/ofono.c b/plugins/ofono.c index 3b76dcb..02c6d9e 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -620,7 +620,8 @@ static int add_network(struct connman_device *device, if (connman_device_add_network(device, network) != 0) goto error; - if (active) + /* Connect only if requested to do so */ + if (active && connman_network_get_connecting(network) == TRUE) set_connected(info, active); return 0; @@ -1735,7 +1736,13 @@ static gboolean context_changed(DBusConnection *connection, dbus_message_iter_get_basic(&value, &active); - set_connected(info, active); + if (active == FALSE) + set_connected(info, active); + + /* Connect only if requested to do so */ + if (active == TRUE && + connman_network_get_connecting(info->network) == TRUE) + set_connected(info, active); } return TRUE; -- 2.7.4