tui,examples: accept null SSID gracefully

Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
https://bugzilla.gnome.org/show_bug.cgi?id=736802

diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index f3b02e9..98e46ba 100644 (file)
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -294,8 +294,9 @@ add_connections_for_aps (NmtConnectDevice *nmtdev,
                nmtconn->device = nmtdev->device;
                nmtconn->ap = g_object_ref (ap);
                ssid = nm_access_point_get_ssid (ap);
-               nmtconn->ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
-                                                      g_bytes_get_size (ssid));
+               if (ssid)
+                       nmtconn->ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
+                                                              g_bytes_get_size (ssid));
 
                for (iter = connections; iter; iter = iter->next) {
                        conn = iter->data;
@@ -308,7 +309,7 @@ add_connections_for_aps (NmtConnectDevice *nmtdev,
                }
 
                if (!iter)
-                       nmtconn->name = nmtconn->ssid;
+                       nmtconn->name = nmtconn->ssid ? nmtconn->ssid : "<unknown>";
 
                nmtdev->conns = g_slist_prepend (nmtdev->conns, nmtconn);
        }

diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c
index efb70bf..5868c27 100644 (file)
--- a/examples/C/glib/get-ap-info-libnm.c
+++ b/examples/C/glib/get-ap-info-libnm.c
@@ -97,7 +97,10 @@ show_access_point_info (NMAccessPoint *ap)
        strength = nm_access_point_get_strength (ap);
 
        /* Convert to strings */
-       ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid));
+       if (ssid)
+               ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid));
+       else
+               ssid_str = g_strdup ("--");
        freq_str = g_strdup_printf ("%u MHz", freq);
        bitrate_str = g_strdup_printf ("%u Mbit/s", bitrate/1000);
        strength_str = g_strdup_printf ("%u", strength);
@@ -163,8 +166,11 @@ show_wifi_device_info (NMDevice *device)
        if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED) {
                if ((active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device)))) {
                        active_ssid = nm_access_point_get_ssid (active_ap);
-                       active_ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (active_ssid, NULL),
-                                                                g_bytes_get_size (active_ssid));
+                       if (active_ssid)
+                               active_ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (active_ssid, NULL),
+                                                                        g_bytes_get_size (active_ssid));
+                       else
+                               active_ssid_str = g_strdup ("--");
                }
        }