[gnome-control-center/wip/hadess/power-remove-wimax: 33/33] power: Remove WiMax handling

[Robert Ancell <rancell src gnome org>]

commit 12e2475e7274396f52017b44cacd697cf91931dd
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Sep 16 16:50:11 2020 +0200

    power: Remove WiMax handling
    
    It's been deprecated and unsupported by NetworkManager since version 1.2
    (current is 1.26).

 panels/power/cc-power-panel.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 2ef380846..ec4d2e842 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1297,7 +1297,6 @@ has_mobile_devices (NMClient *client)
       device = g_ptr_array_index (devices, i);
       switch (nm_device_get_device_type (device))
         {
-        case NM_DEVICE_TYPE_WIMAX:
         case NM_DEVICE_TYPE_MODEM:
           return TRUE;
         default:
@@ -1316,8 +1315,6 @@ mobile_switch_changed (CcPowerPanel *self)
   enabled = gtk_switch_get_active (GTK_SWITCH (self->mobile_switch));
   g_debug ("Setting wwan %s", enabled ? "enabled" : "disabled");
   nm_client_wwan_set_enabled (self->nm_client, enabled);
-  g_debug ("Setting wimax %s", enabled ? "enabled" : "disabled");
-  nm_client_wimax_set_enabled (self->nm_client, enabled);
 }
 
 static void
@@ -1344,15 +1341,12 @@ nm_client_state_changed (CcPowerPanel *self)
 
   visible = has_mobile_devices (self->nm_client);
 
-  /* Set the switch active, if either of wimax or wwan is enabled. */
+  /* Set the switch active, if wwan is enabled. */
   active = nm_client_networking_get_enabled (self->nm_client) &&
-           ((nm_client_wimax_get_enabled (self->nm_client) &&
-             nm_client_wimax_hardware_get_enabled (self->nm_client)) ||
-            (nm_client_wwan_get_enabled (self->nm_client) &&
-             nm_client_wwan_hardware_get_enabled (self->nm_client)));
+           (nm_client_wwan_get_enabled (self->nm_client) &&
+            nm_client_wwan_hardware_get_enabled (self->nm_client));
   sensitive = nm_client_networking_get_enabled (self->nm_client) &&
-              (nm_client_wwan_hardware_get_enabled (self->nm_client) ||
-               nm_client_wimax_hardware_get_enabled (self->nm_client));
+              nm_client_wwan_hardware_get_enabled (self->nm_client);
 
   g_debug ("mobile state changed to %s", active ? "enabled" : "disabled");