From a0991c8261b757e0a9ba8a61d5daf805f62de865 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 12 Jun 2013 15:27:09 -0400 Subject: [PATCH] network: "Remove" support for dial-up modems NetworkManager has never supported dial-up modems, which are the only case we have a modem device without any of these capabilities. https://bugzilla.gnome.org/show_bug.cgi?id=701954 --- js/ui/status/network.js | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 0ca02ea39..a1b6a5c82 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -584,46 +584,25 @@ const NMDeviceWired = new Lang.Class({ const NMDeviceModem = new Lang.Class({ Name: 'NMDeviceModem', Extends: NMDevice, + category: NMConnectionCategory.WWAN, _init: function(client, device, connections) { - let is_wwan = false; - device._description = _("Mobile broadband"); this._enabled = true; this.mobileDevice = null; - this._connectionType = 'ppp'; this._capabilities = device.current_capabilities; // Support new ModemManager1 devices if (device.udi.indexOf('/org/freedesktop/ModemManager1/Modem') == 0) { - is_wwan = true; this.mobileDevice = new ModemManager.BroadbandModem(device.udi, device.current_capabilities); - if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) { - this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME; - } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) { - this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME; - } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.CDMA_EVDO) { - this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME; - } } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) { - is_wwan = true; this.mobileDevice = new ModemManager.ModemGsm(device.udi); - this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME; } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.CDMA_EVDO) { - is_wwan = true; this.mobileDevice = new ModemManager.ModemCdma(device.udi); - this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME; } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) { - is_wwan = true; this.mobileDevice = new ModemManager.ModemGsm(device.udi); - this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME; } - if (is_wwan) - this.category = NMConnectionCategory.WWAN; - else - this.category = NMConnectionCategory.WIRED; - if (this.mobileDevice) { this._operatorNameId = this.mobileDevice.connect('notify::operator-name', Lang.bind(this, function() { if (this._operatorItem) {