Remove obsolete file.
[connman] / src / device.c
index 848c6f9..cd9105d 100644 (file)
@@ -1405,7 +1405,7 @@ static void connect_known_network(struct connman_device *device)
                name = connman_network_get_string(value,
                                                CONNMAN_PROPERTY_ID_NAME);
                if (name != NULL) {
-                       err = connman_network_connect(network);
+                       err = __connman_network_connect(network);
                        if (err == 0 || err == -EINPROGRESS)
                                return;
                }
@@ -1714,17 +1714,25 @@ void __connman_device_set_network(struct connman_device *device,
 {
        const char *name;
 
+       if (device->network == network)
+               return;
+
+       if (device->network != NULL)
+               connman_network_unref(device->network);
+
        if (network != NULL) {
                name = connman_network_get_string(network,
                                                CONNMAN_PROPERTY_ID_NAME);
                g_free(device->last_network);
                device->last_network = g_strdup(name);
+
+               device->network = connman_network_ref(network);
        } else {
                g_free(device->last_network);
                device->last_network = NULL;
-       }
 
-       device->network = network;
+               device->network = NULL;
+       }
 }
 
 /**