ofono: Create the cellular network only when attached to the PS network

3G auto-connection may fail as the cellular network service may not be
ready to connect.
With this patch, the cellular network service should be exposed only after
PS network attachment is done.

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 6652077..95bb612 100644 (file)
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -1247,10 +1247,15 @@ static void modem_gprs_changed(struct modem_data *modem,
        if (g_str_equal(key, "Attached") == TRUE) {
                DBG("Attached %d", value);
 
+               if (modem->attached == value)
+                       return;
+
                modem->attached = value;
 
-               if (value)
+               if (value == TRUE) {
                        modem_clear_network_errors(modem);
+                       check_networks(modem);
+               }
        } else if (g_str_equal(key, "Powered") == TRUE) {
                DBG("Powered %d", value);
 
@@ -1295,7 +1300,6 @@ done:
 
        dbus_pending_call_unref(call);
 
-       check_networks(modem);
 }
 
 static void check_gprs(struct modem_data *modem)
@@ -1769,6 +1773,10 @@ static gboolean context_added(DBusConnection *connection,
        if (modem == NULL || modem->device == NULL)
                return TRUE;
 
+       /* Create the related network only when we are attached */
+       if (modem->attached == FALSE)
+               return TRUE;
+
        if (dbus_message_iter_init(message, &iter) == FALSE)
                return TRUE;