Fix broken network group name handling

[connman] / plugins / supplicant.c

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index b010968..730fd3d 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -1110,8 +1110,6 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
                connman_network_set_string(network, "Address", result.addr);
 
-               connman_network_set_group(network, group);
-
                if (result.name != NULL && result.name[0] != '\0')
                        connman_network_set_string(network, "Name", result.name);
 
@@ -1126,10 +1124,6 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
                }
        }
 
-       connman_network_set_group(network, group);
-
-       g_free(group);
-
        if (result.name != NULL && result.name[0] != '\0')
                connman_network_set_string(network, "Name", result.name);
 
@@ -1147,6 +1141,10 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
        connman_network_set_string(network, "WiFi.Security", security);
 
+       connman_network_set_group(network, group);
+
+       g_free(group);
+
 done:
        g_free(result.path);
        g_free(result.addr);