From 4440b58cbe1f130f03f900c0940328692bc72da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Thu, 22 Sep 2016 00:03:01 +0200
Subject: [PATCH] Now able to display a list of ssid

---
 menu/menu_displaylist.c   | 2 +-
 wifi/drivers/connmanctl.c | 8 ++++++--
 wifi/drivers/nullwifi.c   | 2 +-
 wifi/wifi_driver.c        | 5 +----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 93534f153c..96fa3e598d 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -4673,7 +4673,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             {
                const char *ssid = ssid_list->elems[i].data;
                menu_entries_append_enum(info->list,
-                     "Test",
+                     ssid,
                      msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT),
                      MENU_ENUM_LABEL_LOAD_CONTENT,
                      MENU_SETTING_ACTION, 0, 0);
diff --git a/wifi/drivers/connmanctl.c b/wifi/drivers/connmanctl.c
index d31416e723..a3fcb98f69 100644
--- a/wifi/drivers/connmanctl.c
+++ b/wifi/drivers/connmanctl.c
@@ -43,9 +43,13 @@ static void connmanctl_scan(struct string_list *list)
 {
    union string_list_elem_attr attr;
    attr.i = RARCH_FILETYPE_UNSET;
+   char ssid[512];
 
-   string_list_append(list, "LALA", attr);
-   string_list_append(list, "LOLO", attr);
+   FILE* file = popen("connmanctl services", "r");
+   while (fgets (ssid, 512, file) != NULL)
+      string_list_append(list, ssid, attr);
+
+   pclose(file);
 }
 
 wifi_driver_t wifi_connmanctl = {
diff --git a/wifi/drivers/nullwifi.c b/wifi/drivers/nullwifi.c
index 031eaf7e6c..7cb6610436 100644
--- a/wifi/drivers/nullwifi.c
+++ b/wifi/drivers/nullwifi.c
@@ -38,7 +38,7 @@ static void nullwifi_stop(void *data)
    (void)data;
 }
 
-static void nullwifi_scan(struct string_list **list)
+static void nullwifi_scan(struct string_list *list)
 {
 }
 
diff --git a/wifi/wifi_driver.c b/wifi/wifi_driver.c
index 2e9b269cf0..03564c98b8 100644
--- a/wifi/wifi_driver.c
+++ b/wifi/wifi_driver.c
@@ -98,10 +98,7 @@ bool driver_wifi_start(void)
 
 void driver_wifi_scan(struct string_list *list)
 {
-   if (wifi_driver && wifi_data && wifi_driver->scan)
-   {
-      wifi_driver->scan(list);
-   }
+   wifi_driver->scan(list);
 }
 
 bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data)